Fix regressions

Author: jelmer

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]