Fix some test failures after a run with python 3.6 - 3.10

pyobjc-core/Lib/PyObjCTools/TestSupport.py

@@ -369,7 +369,8 @@ def assertIsCFType(self, tp, message=None):
         #    self.fail(message or "%r is not a CFTypeRef subclass"%(tp,))
 
     def assertIsEnumType(self, tp):
-        if _sys.version_info < (3, 8):
+        tmp = _typing.NewType("tmp", int)
+        if isinstance(tmp, type(lambda: 1)):
             # typing.NewType is not a type in Python 3.7 or earlier
             if not isinstance(tp, type(lambda: 1)):
                 self.fail(f"{tp!r} is not a typing.NewType")

pyobjc-core/PyObjCTest/test_assocations.py

@@ -18,17 +18,20 @@ def testInvalidCalls(self):
         o = NSObject.alloc().init()
         key1 = "key1"
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'value' \(pos 3\)"
+            TypeError,
+            r"(function missing required argument 'value' \(pos 3\))|(Required argument 'value' \(pos 3\) not found)",
         ):
             objc.setAssociatedObject(o, key1)
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'key' \(pos 2\)"
+            TypeError,
+            r"(function missing required argument 'key' \(pos 2\))|(Required argument 'key' \(pos 2\) not found)",
         ):
             objc.getAssociatedObject(o)
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'object' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'object' \(pos 1\))|(Required argument 'object' \(pos 1\) not found)",
         ):
             objc.removeAssociatedObjects()
 

pyobjc-core/PyObjCTest/test_internals.py

@@ -115,12 +115,14 @@ def replacement3_(self, arg):
 class TestRescanClass(TestCase):
     def test_invalid_usage(self):
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'name' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'name' \(pos 1\))|(Required argument 'name' \(pos 1\) not found)",
         ):
             objc._rescanClass()
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'name' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'name' \(pos 1\))|(Required argument 'name' \(pos 1\) not found)",
         ):
             objc._rescanClass(naam="NSObject")
 

pyobjc-core/PyObjCTest/test_ivar.py

@@ -316,7 +316,8 @@ def __pyobjc_object__(self):
             setter(obj, "rectValue", 42)
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'name' \(pos 2\)"
+            TypeError,
+            r"(function missing required argument 'name' \(pos 2\))|(Required argument 'name' \(pos 2\) not found)",
         ):
             setter(obj)
 

pyobjc-core/PyObjCTest/test_methodedits.py

@@ -45,13 +45,13 @@ class TestFromObjCSuperToObjCClass(TestCase):
     def test_invalid_adding(self):
         with self.assertRaisesRegex(
             TypeError,
-            r"classAddMethods\(\) missing required argument 'methodsArray' \(pos 2\)",
+            r"(classAddMethods\(\) missing required argument 'methodsArray' \(pos 2\))|(Required argument 'methodsArray' \(pos 2\) not found)",  # noqa: B950
         ):
             objc.classAddMethods(NSObject)
 
         with self.assertRaisesRegex(
             TypeError,
-            r"classAddMethods\(\) missing required argument 'targetClass' \(pos 1\)",
+            r"(classAddMethods\(\) missing required argument 'targetClass' \(pos 1\))|(Required argument 'targetClass' \(pos 1\) not found)",  # noqa: B950
         ):
             objc.classAddMethods(aClass=NSObject, methods=[])
 

pyobjc-core/PyObjCTest/test_number_proxy.py

@@ -373,7 +373,8 @@ def testClasses(self):
 
     def test_repythonify_invalid(self):
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'obj' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'obj' \(pos 1\))|(Required argument 'obj' \(pos 1\) not found)",
         ):
             objc.repythonify()
 

pyobjc-core/PyObjCTest/test_pointer_compat.py

@@ -51,7 +51,8 @@ def test_voidp_using_ctypes(self):
 
     def test_pyobjc_id_invalid(self):
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'obj' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'obj' \(pos 1\))|(Required argument 'obj' \(pos 1\) not found)",
         ):
             objc.pyobjc_id()
 

pyobjc-core/PyObjCTest/test_python_method.py

@@ -8,7 +8,8 @@
 class TestPythonMethod(TestCase):
     def test_creation(self):
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'callable' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'callable' \(pos 1\))|(Required argument 'callable' \(pos 1\) not found)",
         ):
             objc.python_method()
         with self.assertRaisesRegex(

pyobjc-core/PyObjCTest/test_version_support.py

@@ -34,7 +34,8 @@ def test_macos_available(self):
             )
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'major' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'major' \(pos 1\))|(Required argument 'major' \(pos 1\) not found)",
         ):
             objc.macos_available()
 

pyobjc-core/PyObjCTest/test_weakref.py

@@ -119,7 +119,8 @@ def test_weakref_call_interface(self):
             r(x=1)
 
         with self.assertRaisesRegex(
-            TypeError, r"function missing required argument 'object' \(pos 1\)"
+            TypeError,
+            r"(function missing required argument 'object' \(pos 1\))|(Required argument 'object' \(pos 1\) not found)",
         ):
             objc.WeakRef(value=o)