Fix regressions

Author: jelmer

testtools/_version.pyi

@@ -1,3 +1,5 @@
 # Type stub for auto-generated _version module
-__version__: tuple[int | str, ...]
+from typing import Union
+
+__version__: tuple[Union[int, str], ...]
 version: str

testtools/testresult/real.py

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

testtools/tests/helpers.py

@@ -54,6 +54,9 @@ def addError(self, test, err=None, details=None):
         super().addError(test, err, details)
 
     def addSkip(self, test, reason=None, details=None):
+        # Extract reason from details if not provided directly
+        if reason is None and details and "reason" in details:
+            reason = details["reason"].as_text()
         self._events.append(("addSkip", test, reason))
         super().addSkip(test, reason, details)
 

testtools/tests/matchers/test_higherorder.py

@@ -81,11 +81,11 @@ class TestAnyMatch(TestCase, TestMatchersInterface):
     ]
 
 
-class TestAfterPreprocessing(TestCase, TestMatchersInterface):
-    @staticmethod
-    def parity(x):
-        return x % 2
+def parity(x):
+    return x % 2
+
 
+class TestAfterPreprocessing(TestCase, TestMatchersInterface):
     matches_matcher: ClassVar = AfterPreprocessing(parity, Equals(1))
     matches_matches: ClassVar = [3, 5]
     matches_mismatches: ClassVar = [2]

testtools/tests/test_testsuite.py

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