Fix ruff issues

Author: jelmer

testtools/helpers.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2010-2012 testtools developers. See LICENSE for details.
 
-from typing import Any, Callable, TypeVar
+from collections.abc import Callable
+from typing import Any, TypeVar
 
 T = TypeVar("T")
 K = TypeVar("K")

testtools/matchers/_basic.py

@@ -17,8 +17,9 @@
 
 import operator
 import re
+from collections.abc import Callable
 from pprint import pformat
-from typing import Any, Callable
+from typing import Any
 
 from ..compat import (
     text_repr,

testtools/testcase.py

@@ -20,7 +20,7 @@
 import itertools
 import sys
 import unittest
-from typing import Any, Protocol, TypeVar, Union
+from typing import Any, Protocol, TypeVar
 from unittest.case import SkipTest
 
 from testtools import content
@@ -1117,7 +1117,7 @@ def __exit__(self, exc_type, exc_value, traceback):
             return False
         if self.value_re:
             exception_matcher = MatchesException(self.exc_type, self.value_re)
-            matcher: Union[Matcher, Annotate]
+            matcher: Matcher | Annotate
             if self.msg:
                 matcher = Annotate(self.msg, exception_matcher)
             else:

testtools/testresult/real.py

@@ -28,7 +28,7 @@
 import sys
 import unittest
 from operator import methodcaller
-from typing import ClassVar, Union
+from typing import ClassVar
 
 from testtools.compat import _b
 from testtools.content import (
@@ -1667,7 +1667,7 @@ def __init__(self, decorated):
         # Deal with mismatched base class constructors.
         TestControl.__init__(self)
         self._started = False
-        self._tags: Union[TagContext, None] = None
+        self._tags: TagContext | None = None
 
     def _get_failfast(self):
         return len(self.targets) == 2

testtools/tests/matchers/helpers.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2008-2012 testtools developers. See LICENSE for details.
 
-from typing import Any, Callable, ClassVar, Protocol, runtime_checkable
+from collections.abc import Callable
+from typing import Any, ClassVar, Protocol, runtime_checkable
 
 
 @runtime_checkable

testtools/tests/matchers/test_filesystem.py

@@ -4,7 +4,8 @@
 import shutil
 import tarfile
 import tempfile
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from testtools import TestCase
 from testtools.matchers import (

testtools/tests/test_assert_that.py

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from doctest import ELLIPSIS
-from typing import Any, Callable
+from typing import Any
 
 from testtools import (
     TestCase,

testtools/tests/test_testsuite.py

@@ -5,7 +5,6 @@
 import doctest
 import unittest
 from pprint import pformat
-from typing import Union
 
 from testtools import (
     ConcurrentStreamTestSuite,
@@ -354,7 +353,7 @@ def setUp(self):
             self.skipTest("Need fixtures")
 
     def test_fixture_suite(self):
-        log: list[Union[int, str]] = []
+        log: list[int | str] = []
 
         class Sample(TestCase):
             def test_one(self):
@@ -371,7 +370,7 @@ def test_two(self):
         self.assertEqual(["setUp", 1, 2, "tearDown"], log)
 
     def test_fixture_suite_sort(self):
-        log: list[Union[int, str]] = []
+        log: list[int | str] = []
 
         class Sample(TestCase):
             def test_one(self):

testtools/tests/twistedsupport/_helpers.py

@@ -4,14 +4,14 @@
     "NeedsTwistedTestCase",
 ]
 
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from testtools import TestCase
 
 if TYPE_CHECKING:
     from types import ModuleType
 
-    defer: Optional[ModuleType]
+    defer: ModuleType | None
 else:
     try:
         from twisted.internet import defer