Make linter happy after python upgrade

Signed-off-by: Jussi Kukkonen <[email protected]>

Author: jku

tests/test_fetcher_ng.py

@@ -170,9 +170,10 @@ def test_download_file_upper_length(self) -> None:
 
     # Download a file bigger than expected
     def test_download_file_length_mismatch(self) -> None:
-        with self.assertRaises(
-            exceptions.DownloadLengthMismatchError
-        ), self.fetcher.download_file(self.url, self.file_length - 4):
+        with (
+            self.assertRaises(exceptions.DownloadLengthMismatchError),
+            self.fetcher.download_file(self.url, self.file_length - 4),
+        ):
             pass  # we never get here as download_file() raises
 
 

tests/test_trusted_metadata_set.py

@@ -6,9 +6,8 @@
 import os
 import sys
 import unittest
-from collections.abc import Callable
 from datetime import datetime, timezone
-from typing import ClassVar
+from typing import TYPE_CHECKING, ClassVar
 
 from securesystemslib.signer import Signer
 
@@ -31,6 +30,9 @@
 )
 from tuf.ngclient.config import EnvelopeType
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 logger = logging.getLogger(__name__)
 
 

tests/test_updater_ng.py

@@ -11,7 +11,7 @@
 import sys
 import tempfile
 import unittest
-from collections.abc import Callable, Iterable
+from collections.abc import Iterable
 from typing import TYPE_CHECKING, ClassVar
 from unittest.mock import MagicMock, patch
 
@@ -30,7 +30,7 @@
 from tuf.ngclient import Updater, UpdaterConfig
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
+    from collections.abc import Callable, Iterable
 
 logger = logging.getLogger(__name__)
 

tests/utils.py

@@ -31,13 +31,12 @@
 import threading
 import time
 import warnings
-from collections.abc import Callable
 from contextlib import contextmanager
 from typing import IO, TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     import unittest
-    from collections.abc import Iterator
+    from collections.abc import Callable, Iterator
 
 logger = logging.getLogger(__name__)
 

tuf/api/_payload.py

@@ -1191,8 +1191,8 @@ def _is_target_in_pathpattern(targetpath: str, pathpattern: str) -> bool:
 
         # Every part in the pathpattern could include a glob pattern, that's why
         # each of the target and pathpattern parts should match.
-        for target_dir, pattern_dir in zip(target_parts, pattern_parts):
-            if not fnmatch.fnmatch(target_dir, pattern_dir):
+        for target, pattern in zip(target_parts, pattern_parts, strict=False):
+            if not fnmatch.fnmatch(target, pattern):
                 return False
 
         return True

tuf/ngclient/_internal/trusted_metadata_set.py

@@ -66,7 +66,7 @@
 import datetime
 import logging
 from collections import abc
-from typing import TYPE_CHECKING, Union, cast
+from typing import TYPE_CHECKING, cast
 
 from tuf.api import exceptions
 from tuf.api.dsse import SimpleEnvelope
@@ -88,7 +88,7 @@
 
 logger = logging.getLogger(__name__)
 
-Delegator = Union[Root, Targets]
+Delegator = Root | Targets
 
 
 class TrustedMetadataSet(abc.Mapping):