From 3fc1d2793745ae682305b748f1d1dedf4fa0a5e9 Mon Sep 17 00:00:00 2001 From: Mark Paronyan Date: Mon, 28 Sep 2026 06:46:59 +0000 Subject: [PATCH] fix(typing): resolve mypy errors in utils.zipfile_zstd --- gns3server/utils/zipfile_zstd/__init__.py | 2 +- gns3server/utils/zipfile_zstd/_zipfile.py | 11 ++++++++--- pyproject.toml | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gns3server/utils/zipfile_zstd/__init__.py b/gns3server/utils/zipfile_zstd/__init__.py index 4aae04421..f43df1493 100644 --- a/gns3server/utils/zipfile_zstd/__init__.py +++ b/gns3server/utils/zipfile_zstd/__init__.py @@ -2,7 +2,7 @@ from . import _zipfile from zipfile import * -from zipfile import ( +from ._zipfile import ( ZIP_ZSTANDARD, ZSTANDARD_VERSION, ) diff --git a/gns3server/utils/zipfile_zstd/_zipfile.py b/gns3server/utils/zipfile_zstd/_zipfile.py index 2d5d200fa..e4bb61b03 100644 --- a/gns3server/utils/zipfile_zstd/_zipfile.py +++ b/gns3server/utils/zipfile_zstd/_zipfile.py @@ -1,13 +1,18 @@ -import zipfile +import zipfile as _zipfile_module import zstandard as zstd import inspect +from typing import Any from ._patcher import patch +zipfile: Any = _zipfile_module -zipfile.ZIP_ZSTANDARD = 93 +ZIP_ZSTANDARD = 93 +ZSTANDARD_VERSION = 20 + +zipfile.ZIP_ZSTANDARD = ZIP_ZSTANDARD zipfile.compressor_names[zipfile.ZIP_ZSTANDARD] = "zstandard" -zipfile.ZSTANDARD_VERSION = 20 +zipfile.ZSTANDARD_VERSION = ZSTANDARD_VERSION @patch(zipfile, "_check_compression") diff --git a/pyproject.toml b/pyproject.toml index 21c8a9ba6..64d92894e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -427,8 +427,6 @@ module = [ "gns3server.utils.images", # 4 "gns3server.utils.packet_filter_validation", # 16 "gns3server.utils.websocket_to_websocket", # 12 - "gns3server.utils.zipfile_zstd", # 2 "gns3server.utils.zipfile_zstd._patcher", # 1 - "gns3server.utils.zipfile_zstd._zipfile", # 5 ] ignore_errors = true