From 82bcc398fbaab0e1485d0cb3412870ad748282a0 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 23 Jul 2026 22:18:04 +0200 Subject: [PATCH 1/3] Replace namedtuple with NamedTuple --- usb1/__init__.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/usb1/__init__.py b/usb1/__init__.py index f876808..9bbfcbe 100644 --- a/usb1/__init__.py +++ b/usb1/__init__.py @@ -44,6 +44,7 @@ All LIBUSB_ERROR_* constants are available in this module as exception classes, subclassing USBError. """ +from __future__ import annotations import collections import contextlib @@ -60,6 +61,9 @@ import weakref from . import _libusb1 as libusb1 from . import _version +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from typing import NamedTuple __version__ = _version.get_versions()['version'] # pylint: disable=wrong-import-order,ungrouped-imports if sys.platform == 'win32': @@ -129,10 +133,15 @@ def mayRaiseUSBError( __raiseUSBError(value) return value -Version = collections.namedtuple( - 'Version', - ['major', 'minor', 'micro', 'nano', 'rc', 'describe'], -) +class Version(NamedTuple): + + major: int + minor: int + micro: int + nano: int + rc: str + describe: str + # pylint: disable=undefined-variable CONTROL_SETUP = b'\x00' * CONTROL_SETUP_SIZE From ea4335da33cd52fda47a5bcd065a0111ee5976ee Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 23 Jul 2026 22:28:33 +0200 Subject: [PATCH 2/3] Fixup --- usb1/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usb1/__init__.py b/usb1/__init__.py index 9bbfcbe..0ff08a8 100644 --- a/usb1/__init__.py +++ b/usb1/__init__.py @@ -61,9 +61,9 @@ import weakref from . import _libusb1 as libusb1 from . import _version -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, NamedTuple if TYPE_CHECKING: - from typing import NamedTuple + pass __version__ = _version.get_versions()['version'] # pylint: disable=wrong-import-order,ungrouped-imports if sys.platform == 'win32': From fdf78bb69cd9fd7d6f6146d29560eb52dbf0ec10 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 23 Jul 2026 22:34:38 +0200 Subject: [PATCH 3/3] Nix dead import Removed unused import of collections. --- usb1/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/usb1/__init__.py b/usb1/__init__.py index 0ff08a8..fb8843b 100644 --- a/usb1/__init__.py +++ b/usb1/__init__.py @@ -46,7 +46,6 @@ """ from __future__ import annotations -import collections import contextlib from ctypes import byref, c_int, sizeof, POINTER, \ cast, c_uint8, c_uint16, c_ubyte, c_void_p, cdll, addressof, \