From 74d07173c16954736176e1618b56815c5afee3d7 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 31 Oct 2024 13:48:22 +1000 Subject: [PATCH] Upgrade aiohttp to v3.10.10. Fixes #2411 --- gns3server/controller/__init__.py | 2 +- gns3server/controller/symbols.py | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py index 6f82a42d..aa07b5b1 100644 --- a/gns3server/controller/__init__.py +++ b/gns3server/controller/__init__.py @@ -91,7 +91,7 @@ class Controller: if server_config.enable_ssl: self._ssl_context = self._create_ssl_context(server_config) - protocol = server_config.protocol + protocol = server_config.protocol.value if self._ssl_context and protocol != "https": log.warning(f"Protocol changed to 'https' for local compute because SSL is enabled") protocol = "https" diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index 69ec399c..2a7ee788 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -45,7 +45,7 @@ class Symbols: self._symbol_size_cache = {} self._server_config = Config.instance().settings.Server - self._current_theme = self._server_config.default_symbol_theme + self._current_theme = self._server_config.default_symbol_theme.value self._themes = BUILTIN_SYMBOL_THEMES @property diff --git a/requirements.txt b/requirements.txt index e3edbef9..0af21ef9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ uvicorn==0.29.0 fastapi==0.112.0 python-multipart==0.0.9 websockets==12.0 -aiohttp>=3.9.5,<3.10 +aiohttp>=3.10.10,<3.11 async-timeout==4.0.3 aiofiles>=24.1.0,<25.0 Jinja2>=3.1.4,<3.2