pyobjc-core 11.1__tar.gz → 12.1__tar.gz

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/PyObjCTools/TestSupport.py

@@ -27,27 +27,6 @@ __unittest = False
 # Have a way to disable the autorelease pool behaviour
 _usepool = not _os.environ.get("PYOBJC_NO_AUTORELEASE")
 
-# XXX: Python 2 Compatibility for the PyObjC Test Suite
-try:
-    unicode
-except NameError:
-    unicode = str
-
-try:
-    long
-except NameError:
-    long = int
-
-try:
-    basestring
-except NameError:
-    basestring = str
-
-try:
-    unichr
-except NameError:
-    unichr = chr
-
 
 def _typemap(tp):
     if tp is None:
@@ -176,6 +155,10 @@ def os_release():
     if _os_release is not None:
         return _os_release
 
+    # NOTE: This calls 'sw_vers' because system APIs lie
+    #       to us during some system transitions (e.g.
+    #       from 10.15 to 11.0 and from 15.0 to 26.0) until
+    #       Python itself is rebuild using a newer SDK.
     _os_release = (
         _subprocess.check_output(["sw_vers", "-productVersion"]).decode().strip()
     )
@@ -318,7 +301,7 @@ def os_level_between(min_release, max_release):
 _poolclass = objc.lookUpClass("NSAutoreleasePool")
 
 # NOTE: On at least macOS 10.8 there are multiple proxy classes for CFTypeRef...
-_nscftype = tuple(cls for cls in objc.getClassList(1) if "NSCFType" in cls.__name__)
+_nscftype = tuple(cls for cls in objc.getClassList(True) if "NSCFType" in cls.__name__)
 
 _typealias = {}
 
@@ -631,7 +614,7 @@ class TestCase(_unittest.TestCase):
 
     def assertIsInitializer(self, method, message=None):
         if not isinstance(method, objc.selector):
-            return
+            self.fail(message or f"{method!r} is not a selector")
 
         info = method.__metadata__()
         if not info.get("initializer", False):
@@ -639,7 +622,7 @@ class TestCase(_unittest.TestCase):
 
     def assertIsNotInitializer(self, method, message=None):
         if not isinstance(method, objc.selector):
-            return
+            self.fail(message or f"{method!r} is not a selector")
 
         info = method.__metadata__()
         if info.get("initializer", False):
@@ -647,7 +630,7 @@ class TestCase(_unittest.TestCase):
 
     def assertDoesFreeResult(self, method, message=None):
         if not isinstance(method, objc.selector):
-            return
+            self.fail(message or f"{method!r} is not a selector")
 
         info = method.__metadata__()
         if not info.get("free_result", False):
@@ -655,7 +638,7 @@ class TestCase(_unittest.TestCase):
 
     def assertDoesNotFreeResult(self, method, message=None):
         if not isinstance(method, objc.selector):
-            return
+            self.fail(message or f"{method!r} is not a selector")
 
         info = method.__metadata__()
         if info.get("free_result", False):
@@ -686,6 +669,20 @@ class TestCase(_unittest.TestCase):
     def assertResultHasType(self, method, tp, message=None):
         info = method.__metadata__()
         typestr = info.get("retval").get("type", b"v")
+        if isinstance(tp, tuple):
+            for item in tp:
+                if (
+                    typestr == item
+                    or _typemap(typestr) == _typemap(item)
+                    or _typealias.get(typestr, typestr) == _typealias.get(item, item)
+                ):
+                    break
+            else:
+                self.fail(
+                    message
+                    or f"result of {method!r} is not of type {tp!r}, but {typestr!r}"
+                )
+            return
         if (
             typestr != tp
             and _typemap(typestr) != _typemap(tp)
@@ -714,15 +711,28 @@ class TestCase(_unittest.TestCase):
         else:
             typestr = i.get("type", b"@")
 
+        if isinstance(tp, tuple):
+            for item in tp:
+                if (
+                    typestr == item
+                    or _typemap(typestr) == _typemap(item)
+                    or _typealias.get(typestr, typestr) == _typealias.get(item, item)
+                ):
+                    break
+            else:
+                self.fail(
+                    message
+                    or f"arg {argno} of {method!r} is not of type {tp!r}, but {typestr!r}"
+                )
+            return
+
         if (
             typestr != tp
             and _typemap(typestr) != _typemap(tp)
             and _typealias.get(typestr, typestr) != _typealias.get(tp, tp)
         ):
             self.fail(
-                message
-                or "arg %d of %s is not of type %r, but %r"
-                % (argno, method, tp, typestr)
+                message or f"arg {argno} of {method} is not of type {tp}, but {typestr}"
             )
 
     def assertArgIsFunction(self, method, argno, sel_type, retained, message=None):
@@ -1374,27 +1384,35 @@ class TestCase(_unittest.TestCase):
         # Calculate all (interesting) names in the module. This pokes into
         # the implementation details of objc.ObjCLazyModule to avoid loading
         # all attributes (which is expensive for larger bindings).
-        if isinstance(module, objc.ObjCLazyModule) and False:
+        def is_pyobjc_lazy(module):
+            getter = getattr(module, "__getattr__", None)
+            if getter is None:
+                return False
+            return hasattr(getter, "_pyobjc_parents")
+
+        if is_pyobjc_lazy(module):
+            getter = getattr(module, "__getattr__", None)
             module_names = []
             module_names.extend(
                 cls.__name__
-                for cls in objc.getClassList()
+                for cls in objc.getClassList(True)
                 if (not cls.__name__.startswith("_")) and ("." not in cls.__name__)
             )
-            module_names.extend(module._ObjCLazyModule__funcmap or [])
-            module_names.extend(module.__dict__.keys())
-            todo = list(module._ObjCLazyModule__parents or [])
+            module_names.extend(getattr(getter, "_pyobjc_funcmap", None) or [])
+            todo = list(getter._pyobjc_parents)
             while todo:
                 parent = todo.pop()
-                if isinstance(parent, objc.ObjCLazyModule):
-                    module_names.extend(parent._ObjCLazyModule__funcmap or ())
-                    todo.extend(parent._ObjCLazyModule__parents or ())
+                if is_pyobjc_lazy(parent):
+                    getter = getattr(parent, "__getattr__", None)
+                    module_names.extend(getattr(getter, "_pyobjc_funcmap", None) or [])
+                    todo.extend(getter._pyobjc_parents or ())
                     module_names.extend(parent.__dict__.keys())
+
                 else:
-                    module_names.extend(dir(module))
+                    module_names.extend(dir(parent))
 
-            # The module_names list might contain duplicates
             module_names = sorted(set(module_names))
+
         else:
             module_names = sorted(set(dir(module)))
 
@@ -1407,43 +1425,49 @@ class TestCase(_unittest.TestCase):
 
             try:
                 value = getattr(module, nm)
-            except AttributeError:
-                continue
+            except AttributeError:  # pragma: no cover
+                continue  # pragma: no cover
             if isinstance(value, objc.objc_class):
-                if value.__name__ == "Object":
-                    # Root class, does not conform to the NSObject
-                    # protocol and useless to test.
-                    continue
-                for attr_name, attr in value.pyobjc_instanceMethods.__dict__.items():
-                    if attr_name in exclude_method_names:
-                        continue
-                    if (nm, attr_name) in exclude_attrs:
-                        continue
-                    if attr_name.startswith("_"):
-                        # Skip private names
+                with objc.autorelease_pool():
+                    if value.__name__ == "Object":
+                        # Root class, does not conform to the NSObject
+                        # protocol and useless to test.
                         continue
+                    instanceMethodDict = value.pyobjc_instanceMethods.__dict__
+                    for attr_name, attr in instanceMethodDict.items():
+                        if attr_name in exclude_method_names:
+                            continue
+                        if (nm, attr_name) in exclude_attrs:
+                            continue
+                        if attr_name.startswith("_"):
+                            # Skip private names
+                            continue
 
-                    with self.subTest(classname=nm, instance_method=attr_name):
-                        if isinstance(attr, objc.selector):  # pragma: no branch
-                            self._validateCallableMetadata(
-                                attr, nm, skip_simple_charptr_check=not exclude_cocoa
-                            )
-
-                for attr_name, attr in value.pyobjc_classMethods.__dict__.items():
-                    if attr_name in exclude_method_names:
-                        continue
-                    if (nm, attr_name) in exclude_attrs:
-                        continue
-                    if attr_name.startswith("_"):
-                        # Skip private names
-                        continue
+                        with self.subTest(classname=nm, instance_method=attr_name):
+                            if isinstance(attr, objc.selector):  # pragma: no branch
+                                self._validateCallableMetadata(
+                                    attr,
+                                    nm,
+                                    skip_simple_charptr_check=not exclude_cocoa,
+                                )
+
+                    for attr_name, attr in value.pyobjc_classMethods.__dict__.items():
+                        if attr_name in exclude_method_names:  # pragma: no branch
+                            continue  # pragma: no cover
+                        if (nm, attr_name) in exclude_attrs:
+                            continue
+                        if attr_name.startswith("_"):
+                            # Skip private names
+                            continue
 
-                    with self.subTest(classname=nm, instance_method=attr_name):
-                        attr = getattr(value.pyobjc_classMethods, attr_name, None)
-                        if isinstance(attr, objc.selector):  # pragma: no branch
-                            self._validateCallableMetadata(
-                                attr, nm, skip_simple_charptr_check=not exclude_cocoa
-                            )
+                        with self.subTest(classname=nm, instance_method=attr_name):
+                            attr = getattr(value.pyobjc_classMethods, attr_name, None)
+                            if isinstance(attr, objc.selector):  # pragma: no branch
+                                self._validateCallableMetadata(
+                                    attr,
+                                    nm,
+                                    skip_simple_charptr_check=not exclude_cocoa,
+                                )
             elif isinstance(value, objc.function):
                 with self.subTest(function=nm):
                     self._validateCallableMetadata(value)

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/objc/__init__.py

@@ -45,6 +45,7 @@ from . import _callable_docstr  # noqa: F401, F403, E402
 from . import _pycoder  # noqa: F401, F403, E402
 from ._informal_protocol import *  # noqa: F401, F403, E402
 from . import _new  # noqa: F401, E402
+from ._types import *  # noqa: F401, F403, E402
 
 
 # Helper function for new-style metadata modules

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/objc/_convenience_nsarray.py

@@ -133,7 +133,7 @@ def nsarray__getitem__(self, idx):
         return [self[i] for i in range(start, stop, step)]
 
     elif not isinstance(idx, int):
-        raise TypeError("index must be a number")
+        raise TypeError("list indices must be integers or slices")
 
     if idx < 0:
         idx += len(self)

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/objc/_lazyimport.py

@@ -442,6 +442,9 @@ def createFrameworkDirAndGetattr(
     expressions_mapping = ChainMap(globals_dict, _GetAttrMap(__getattr__))
     load_cftypes(metadict.get("cftypes"))
 
+    __getattr__._pyobjc_parents = parents
+    __getattr__._pyobjc_funcmap = funcmap
+
     return __dir__, __getattr__
 
 

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/objc/_new.py

@@ -87,12 +87,22 @@ class function_wrapper:
     def __doc__(self):
         return calculate_new_doc(self._cls)
 
+    @property
+    def __module__(self):
+        return self._cls.__module__
+
     def __getattr__(self, name):
+        if name == "__qualname__":
+            return (
+                (self._cls.__module__ or "objc") + "." + self._cls.__name__ + ".__new__"
+            )
+        elif name == "__name__":
+            return "__new__"
         return getattr(self._function, name)
 
     def __setattr__(self, name, value):
         if name in ("_function", "_cls"):
-            object.__setattr__(self, name, value)
+            return object.__setattr__(self, name, value)
         return setattr(self._function, name, value)
 
     def __call__(self, *args, **kwds):
@@ -154,25 +164,8 @@ def new_func(cls, *args, **kwds):
         raise TypeError(f"{cls.__name__}() requires keyword arguments")
 
 
-FunctionType = type(new_func)
-
-
-def make_generic_new(cls, *, FunctionType=FunctionType, new_func=new_func):
-
-    # XXX: Settings these helps, but does not yet result in the correct
-    #      output from help()
-
-    result = FunctionType(
-        new_func.__code__,
-        new_func.__globals__,
-        cls.__name__ + ".__new__",
-        new_func.__defaults__,
-        new_func.__closure__,
-    )
-    result.__qualname__ = result.__name__
-    result.__module__ = cls.__module__
-    result = function_wrapper(result, cls)
-    return result
+def make_generic_new(cls):
+    return function_wrapper(new_func, cls)
 
 
 objc.options._genericNewClass = function_wrapper

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/objc/_transform.py

@@ -532,12 +532,12 @@ def transformAttribute(name, value, class_object, protocols):
             if pos_default:
                 raise objc.BadPrototypeError(
                     f"{selname.decode()!r} expects {argcount} arguments, "
-                    f"{value!r} has between {pos-pos_default-1} and {pos-1} positional arguments"
+                    f"{value!r} has between {pos - pos_default - 1} and {pos - 1} positional arguments"
                 )
             else:
                 raise objc.BadPrototypeError(
                     f"{selname.decode()!r} expects {argcount} arguments, "
-                    f"{value!r} has {pos-1} positional arguments"
+                    f"{value!r} has {pos - 1} positional arguments"
                 )
 
     # XXX: This is needed because SomeClass.pyobjc_instanceMethods.hiddenSelector.isHidden
@@ -605,9 +605,11 @@ def returns_value(func):
             elif prev.opname != "LOAD_CONST":
                 return True
 
-        elif inst.opname == "RETURN_CONST" and consts[inst.arg] is not None:
-            # New in Python 3.12.
-            return True
+        elif (  # pragma: no branch
+            inst.opname == "RETURN_CONST" and consts[inst.arg] is not None
+        ):
+            # New in Python 3.12, dropped in 3.14
+            return True  # pragma: no cover
         prev = inst
 
     return False
@@ -674,6 +676,10 @@ class objc_method:
         self.signature = signature
         self.isclass = isclass
 
+    @property
+    def __name__(self):
+        return self.__wrapped__.__name__
+
     def __call__(self, *args, **kwds):
         if self.__wrapped__ is None:
             if len(kwds) != 0:

pyobjc_core-12.1/Lib/objc/_types.py

@@ -0,0 +1,7 @@
+"""
+Helper for typing framework bindings
+"""
+
+NSInteger = int
+NSUInteger = int
+CGFloat = float

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/pyobjc_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobjc-core
-Version: 11.1
+Version: 12.1
 Summary: Python<->ObjC Interoperability Module
 Home-page: https://github.com/ronaldoussoren/pyobjc
 Author: Ronald Oussoren, bbum, SteveM, LeleG, many others stretching back through the reaches of time...
@@ -19,17 +19,18 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Free Threading :: 3 - Stable
 Classifier: Programming Language :: Objective C
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: User Interfaces
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst; charset=UTF-8
 Dynamic: author
 Dynamic: author-email

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/pyobjc_core.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ Lib/objc/_pycoder.py
 Lib/objc/_pythonify.py
 Lib/objc/_structtype.py
 Lib/objc/_transform.py
+Lib/objc/_types.py
 Lib/objc/simd.py
 Lib/pyobjc_core.egg-info/PKG-INFO
 Lib/pyobjc_core.egg-info/SOURCES.txt
@@ -174,7 +175,6 @@ Modules/objc/proxy-registry.h
 Modules/objc/proxy-registry.m
 Modules/objc/pyobjc-api.h
 Modules/objc/pyobjc-api.m
-Modules/objc/pyobjc-assert.h
 Modules/objc/pyobjc-compat.h
 Modules/objc/pyobjc-compat.m
 Modules/objc/pyobjc-unittest.h
@@ -201,6 +201,7 @@ Modules/objc/weakref.m
 Modules/objc/test/NULL.m
 Modules/objc/test/arrayint.m
 Modules/objc/test/arrays.m
+Modules/objc/test/authorizationitem.m
 Modules/objc/test/block.m
 Modules/objc/test/block2.m
 Modules/objc/test/bufsizeinarg.m
@@ -278,6 +279,7 @@ Modules/objc/test/clinmeth.m
 Modules/objc/test/coding.m
 Modules/objc/test/copying.m
 Modules/objc/test/corefoundation.m
+Modules/objc/test/customcallers.m
 Modules/objc/test/dataint.m
 Modules/objc/test/dateint.m
 Modules/objc/test/decimal.m
@@ -298,6 +300,7 @@ Modules/objc/test/instanceVariables.m
 Modules/objc/test/locking.m
 Modules/objc/test/metadata.m
 Modules/objc/test/metadatafunction.m
+Modules/objc/test/metadataorder.m
 Modules/objc/test/methodaccess.m
 Modules/objc/test/methodlookup.m
 Modules/objc/test/methres1.m
@@ -324,6 +327,7 @@ Modules/objc/test/structargs.m
 Modules/objc/test/structpointer1.m
 Modules/objc/test/structpointer2.m
 Modules/objc/test/structs.m
+Modules/objc/test/supercall.m
 Modules/objc/test/testbndl.m
 Modules/objc/test/testbndl2.m
 Modules/objc/test/testclassandinst.m
@@ -349,6 +353,7 @@ PyObjCTest/test_array_interface.py
 PyObjCTest/test_array_property.py
 PyObjCTest/test_arrays.py
 PyObjCTest/test_assocations.py
+PyObjCTest/test_authorizationitem.py
 PyObjCTest/test_blocks.py
 PyObjCTest/test_bridged_classes.py
 PyObjCTest/test_bridges.py
@@ -369,6 +374,7 @@ PyObjCTest/test_conversion.py
 PyObjCTest/test_copying.py
 PyObjCTest/test_corefoundation.py
 PyObjCTest/test_ctests.py
+PyObjCTest/test_customcallers.py
 PyObjCTest/test_data_proxy.py
 PyObjCTest/test_date_proxy.py
 PyObjCTest/test_default_selector.py
@@ -409,6 +415,7 @@ PyObjCTest/test_metadata_imp.py
 PyObjCTest/test_metadata_inheritance.py
 PyObjCTest/test_metadata_py.py
 PyObjCTest/test_metadata_py2py.py
+PyObjCTest/test_metadataorder.py
 PyObjCTest/test_method_prototypes.py
 PyObjCTest/test_methodaccess.py
 PyObjCTest/test_methodedits.py
@@ -422,6 +429,7 @@ PyObjCTest/test_nsdate_proxy.py
 PyObjCTest/test_nsdecimal.py
 PyObjCTest/test_nsinvocation.py
 PyObjCTest/test_nsobject.py
+PyObjCTest/test_nsproxy.py
 PyObjCTest/test_nsunavailable.py
 PyObjCTest/test_nulldelimited.py
 PyObjCTest/test_number_proxy.py
@@ -497,6 +505,7 @@ Tools/free-threading/_tools.py
 Tools/free-threading/concurrent-class-list.py
 Tools/free-threading/concurrent-dict-getting.py
 Tools/free-threading/concurrent-iteration.py
+Tools/free-threading/concurrent-methinfo.py
 Tools/free-threading/concurrent-registration.py
 Tools/free-threading/concurrent-value-getting.py
 Tools/results/pyobjcbench-7.3.txt

{pyobjc_core-11.1 → pyobjc_core-12.1}/Lib/pyobjc_core.egg-info/include/pyobjc-api.h

@@ -53,8 +53,9 @@ NS_ASSUME_NONNULL_BEGIN
 /*
  * Only add items to the end of this list!
  */
+
 typedef int(RegisterMethodMappingFunctionType)(
-    Class, SEL,
+    Class _Nullable, SEL,
     PyObject* _Nullable (*_Nonnull)(PyObject* _Nonnull, PyObject* _Nonnull,
                                     PyObject* _Nonnull const* _Nonnull, size_t),
     IMP _Nullable (*_Nonnull)(PyObject* _Nonnull, PyObject* _Nonnull));
@@ -83,7 +84,8 @@ struct pyobjc_api {
     PyObject* _Nullable (*_Nonnull unsupported_method_caller)(
         PyObject* _Nonnull, PyObject* _Nonnull, PyObject* _Nonnull const* _Nonnull,
         size_t);
-    void (*_Nonnull err_python_to_objc_gil)(PyGILState_STATE* _Nonnull state) __attribute__((__noreturn__));
+    void (*_Nonnull err_python_to_objc_gil)(PyGILState_STATE* _Nonnull state)
+        __attribute__((__noreturn__));
     int (*_Nonnull simplify_sig)(const char* signature, char* buf, size_t buflen);
     void (*_Nonnull free_c_array)(int, Py_buffer*);
     int (*_Nonnull py_to_c_array)(BOOL, BOOL, const char* _Nonnull, PyObject* _Nonnull,
@@ -113,7 +115,8 @@ struct pyobjc_api {
     int (*_Nonnull checknokwnames)(PyObject* _Nonnull callable,
                                    PyObject* _Nullable kwnames);
 
-    PyObject* _Nullable (*_Nonnull createopaquepointertype)(const char*, const char*, const char*);
+    PyObject* _Nullable (*_Nonnull createopaquepointertype)(const char*, const char*,
+                                                            const char*);
 };
 
 #ifndef PYOBJC_BUILD