From 25125567707c49a4426281297924526a427717d2 Mon Sep 17 00:00:00 2001 From: Mark Paronyan Date: Mon, 28 Sep 2026 04:42:58 +0000 Subject: [PATCH 1/3] fix(typing): resolve mypy errors in config --- gns3server/config.py | 8 ++++++-- pyproject.toml | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gns3server/config.py b/gns3server/config.py index 0baf2fe2f..ed1507f4e 100644 --- a/gns3server/config.py +++ b/gns3server/config.py @@ -48,6 +48,10 @@ class ConfigConflictError(Exception): LIST_OPTION_SEPARATORS = {"additional_images_paths": ";"} +def parser_sections(parser: configparser.ConfigParser) -> dict[str, dict[str, str]]: + return {section: dict(parser[section]) for section in parser.sections()} + + class Config: """ Configuration file management using configparser. @@ -328,7 +332,7 @@ class Config: changed.append(f"{section}.{option}") # validate the merged settings before touching the file on disk - ServerConfig(**merged_parser._sections) + ServerConfig(**parser_sections(merged_parser)) directory_name = os.path.dirname(main_config_file) if directory_name: @@ -414,7 +418,7 @@ class Config: self._watched_files[file] = os.stat(file).st_mtime try: - self._settings = ServerConfig(**config._sections) + self._settings = ServerConfig(**parser_sections(config)) except ValidationError as e: log.critical(f"Could not validate configuration file settings: {e}") raise diff --git a/pyproject.toml b/pyproject.toml index 21c8a9ba6..74a32a924 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -372,7 +372,6 @@ module = [ "gns3server.compute.virtualbox.virtualbox_vm", # 1 "gns3server.compute.vmware.vmware_vm", # 1 "gns3server.compute.vpcs.vpcs_vm", # 2 - "gns3server.config", # 1 "gns3server.controller.appliance", # 2 "gns3server.controller.appliance_manager", # 5 "gns3server.controller.compute", # 2 From f858ae23a6e283f03e41f555db01ff8e6bde63dc Mon Sep 17 00:00:00 2001 From: Mark Paronyan Date: Mon, 28 Sep 2026 04:41:54 +0000 Subject: [PATCH 2/3] fix(typing): resolve mypy errors in api.routes.index --- gns3server/api/routes/index.py | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gns3server/api/routes/index.py b/gns3server/api/routes/index.py index 365840b8c..23e859bc2 100644 --- a/gns3server/api/routes/index.py +++ b/gns3server/api/routes/index.py @@ -36,7 +36,7 @@ async def root(): @router.get("/debug", response_class=HTMLResponse, deprecated=True, include_in_schema=False) def debug(request: Request): - kwargs = {"gns3_version": __version__, "gns3_host": request.client.host} + kwargs = {"gns3_version": __version__, "gns3_host": request.client.host if request.client else None} return templates.TemplateResponse(request=request, name="index.html", context=kwargs) diff --git a/pyproject.toml b/pyproject.toml index 21c8a9ba6..8da681384 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -359,7 +359,6 @@ module = [ "gns3server.api.routes.controller.snapshots", # 1 "gns3server.api.routes.controller.templates", # 10 "gns3server.api.routes.controller.users", # 14 - "gns3server.api.routes.index", # 1 "gns3server.api.server", # 2 "gns3server.compute.docker.docker_vm", # 3 "gns3server.compute.docker.iol_docker_vm", # 3 From d1df96e0a62550d84851dd26e57d686cb9632a7f Mon Sep 17 00:00:00 2001 From: Mark Paronyan Date: Mon, 28 Sep 2026 04:43:20 +0000 Subject: [PATCH 3/3] fix(typing): resolve mypy errors in utils.asyncio.embed_shell --- gns3server/utils/asyncio/embed_shell.py | 5 ++--- pyproject.toml | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gns3server/utils/asyncio/embed_shell.py b/gns3server/utils/asyncio/embed_shell.py index 3efd0bdbc..7059c9e29 100644 --- a/gns3server/utils/asyncio/embed_shell.py +++ b/gns3server/utils/asyncio/embed_shell.py @@ -236,12 +236,11 @@ class ShellConnection(TelnetConnection): async def disconnected(self): pass - @asyncio.coroutine - def window_size_changed(self, columns, rows): + async def window_size_changed(self, columns, rows): self._size = Size(rows=rows, columns=columns) self._cb.terminal_size_changed() if self._window_size_changed_callback: - yield from self._window_size_changed_callback(columns, rows) + await self._window_size_changed_callback(columns, rows) async def feed(self, data): data = data.decode() diff --git a/pyproject.toml b/pyproject.toml index 21c8a9ba6..f85a8ea85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -421,7 +421,6 @@ module = [ "gns3server.services.computes", # 4 "gns3server.services.templates", # 18 "gns3server.utils.asyncio.aiozipstream", # 8 - "gns3server.utils.asyncio.embed_shell", # 1 "gns3server.utils.encryption", # 2 "gns3server.utils.http_client", # 4 "gns3server.utils.images", # 4