pyobjc-core 10.3__tar.gz → 10.3.2__tar.gz

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Lib/objc/_new.py

@@ -159,3 +159,6 @@ def make_generic_new(cls):
     __new__.__qualname__ = cls.__name__ + ".__new__"
     __new__.__module__ = cls.__module__
     return function_wrapper(__new__, cls)
+
+
+objc.options._genericNewClass = function_wrapper

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Lib/objc/_transform.py

@@ -43,7 +43,9 @@ def _selectorToKeywords(selector):
     parts = selector.split(":")[:-1]
     if parts[0].startswith("With"):
         parts[0] = parts[0][4:]
-    parts[0] = parts[0][:1].lower() + parts[0][1:]
+
+    if len(parts[0]) == 1 or (len(parts[0]) > 1 and not parts[0].isupper()):
+        parts[0] = parts[0][:1].lower() + parts[0][1:]
 
     return tuple(parts)
 

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Lib/pyobjc_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-core
-Version: 10.3
+Version: 10.3.2
 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...

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/class-list.m

@@ -93,8 +93,12 @@ PyObjC_GetClassList(bool ignore_invalid_identifiers)
          * versions should build on the latest one (and preferably
          * use the "official" binary wheels).
          */
+#if 0
         if (@available(macOS 10.15, *)) {
         } else  {
+#else
+        {
+#endif
             /* A numbef of private(-ish) classes that cause
              * crashes when constructed here while running
              * on macOS 10.14

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/objc-class.m

@@ -348,6 +348,7 @@ static PyTypeObject* _Nullable PyObjCClass_NewMetaClass(Class objc_class)
 static PyObject* _Nullable class_call(PyObject* self, PyObject* _Nullable args, PyObject* _Nullable kwds)
 {
     PyTypeObject* type = (PyTypeObject*)self;
+    PyObject* result;
 
     if (type->tp_new == NULL) {
         PyErr_Format( PyExc_TypeError,
@@ -355,7 +356,40 @@ static PyObject* _Nullable class_call(PyObject* self, PyObject* _Nullable args,
         return NULL;
     }
 
-    return type->tp_new(type, args, kwds);
+
+    result = type->tp_new(type, args, kwds);
+    if (result == NULL) {
+        return result;
+    }
+
+    if (PyObject_TypeCheck(result, type) == 0) {
+        return result;
+    }
+
+    if (PyObjC_genericNewClass != NULL && PyObjC_genericNewClass != Py_None) {
+        PyObject* new = PyObject_GetAttr((PyObject*)type, PyObjCNM___new__);
+        if (new == NULL) { /* Shouldn't happen */
+            Py_DECREF(result);
+            return NULL;
+        }
+
+        int r = PyObject_TypeCheck(new, (PyTypeObject*)PyObjC_genericNewClass);
+        Py_DECREF(new);
+        if (r != 0) {
+            return result;
+        }
+    }
+
+    /* Only call __init__ when the generic new implementation is not used */
+
+    type = Py_TYPE(result);
+    if (type->tp_init != NULL) {
+        int res = type->tp_init(result, args, kwds);
+        if (res == -1) {
+            Py_SETREF(result, NULL);
+        }
+    }
+    return result;
 }
 
 
@@ -1075,9 +1109,27 @@ static PyObject* _Nullable class_repr(PyObject* obj)
 static void
 class_dealloc(PyObject* cls)
 {
-    /* XXX: This method should never be called because it is impossible to
-     * unregister and Objective-C class from the Objective-C runtime.
+    if (((PyObjCClassObject*)cls)->class == Nil) {
+        /*
+         * Cleanup of a class proxy that was created due to a race condition in creating
+         * instances.
+         */
+        PyObjCClassObject* info = (PyObjCClassObject*)cls;
+        Py_CLEAR(info->sel_to_py);
+
+        Py_CLEAR(info->delmethod);
+        Py_CLEAR(info->hiddenSelectors);
+        Py_CLEAR(info->hiddenClassSelectors);
+        Py_CLEAR(info->lookup_cache);
+        PyType_Type.tp_dealloc(cls);
+        return;
+    }
+
+    /*
+     * This method should never be called because it is impossible
+     * to unregister an Objective-C class from the runtime.
      */
+
     char buf[1024];
 
     snprintf(buf, sizeof(buf), "Deallocating objective-C class %s",
@@ -2605,7 +2657,20 @@ PyObject* _Nullable PyObjCClass_New(Class objc_class)
     info->hiddenClassSelectors = hiddenClassSelectors;
     info->lookup_cache         = NULL;
 
-    objc_class_register(objc_class, result);
+    PyObject* temp = objc_class_locate(objc_class);
+    if (temp != NULL) {
+        /* Race condition between two threads that
+         * try to register the class.
+         */
+        info->class = Nil;
+        Py_DECREF(result);
+        return temp;
+    }
+
+    if (objc_class_register(objc_class, result) < 0) {
+        Py_DECREF(result);
+        return NULL;
+    }
 
     /*
      * Support the buffer protocol in the wrappers for NSData and
@@ -2625,15 +2690,16 @@ PyObject* _Nullable PyObjCClass_New(Class objc_class)
         PyType_Ready((PyTypeObject*)result);
     }
 
-    if (strcmp(className, "_NSPlaceholderData") == 0) {
-        /* XXX */
+    if (strncmp(className, "_NSPlaceholder", sizeof("_NSPlaceholder")-1) == 0) {
         /* Workaround for an issue on macOS 10.15: For some
          * reason the call to class_getInstanceVariable crashes
          * when called early in the process, likely due to an
          * incompletely initialized class.
          *
-         * The workaround is hardcoded for this specific class
-         * to avoid issues with other magic classes.
+         * The issue is more widespread in later versions of the OS,
+         * and seems to be related to rewriting Foundation in Swift.
+         *
+         * Issues: #271, #625
          */
         [objc_class class];
     }

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/objc_util.h

@@ -123,6 +123,7 @@ extern PyObject* PyObjCNM___get__;
 extern PyObject* PyObjCNM_date_format_string;
 extern PyObject* PyObjCNM_objc_memview_object;
 extern PyObject* PyObjCNM_objc_NULL;
+extern PyObject* PyObjCNM___new__;
 
 extern PyObject* _Nullable PyObjC_CallCopyFunc(PyObject* arg);
 extern PyObject* _Nullable PyObjC_CallDecoder(PyObject* cdr, PyObject* setValue);

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/objc_util.m

@@ -34,6 +34,7 @@ PyObject* PyObjCNM___get__;
 PyObject* PyObjCNM_date_format_string;
 PyObject* PyObjCNM_objc_memview_object;
 PyObject* PyObjCNM_objc_NULL;
+PyObject* PyObjCNM___new__;
 
 int
 PyObjCUtil_Init(PyObject* module)
@@ -84,6 +85,7 @@ PyObjCUtil_Init(PyObject* module)
     NEW_STR(PyObjCNM_date_format_string, "%s");
     NEW_STR(PyObjCNM_objc_memview_object, "objc.memview object");
     NEW_STR(PyObjCNM_objc_NULL, "objc.NULL");
+    NEW_STR(PyObjCNM___new__, "__new__");
 
 #undef NEW_STR
 

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/options.h

@@ -27,6 +27,7 @@ extern PyObject* _Nullable PyObjC_setKeyPath;
 extern PyObject* _Nullable PyObjC_transformAttribute;
 extern PyObject* _Nullable PyObjC_processClassDict;
 extern PyObject* _Nullable PyObjC_setDunderNew;
+extern PyObject* _Nullable PyObjC_genericNewClass;
 
 extern PyObject* _Nullable PyObjC_DictLikeTypes;
 extern PyObject* _Nullable PyObjC_ListLikeTypes;

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/options.m

@@ -164,6 +164,7 @@ OBJECT_PROP(_setKeyPath, PyObjC_setKeyPath, NULL)
 OBJECT_PROP(_transformAttribute, PyObjC_transformAttribute, NULL)
 OBJECT_PROP(_processClassDict, PyObjC_processClassDict, NULL)
 OBJECT_PROP(_setDunderNew, PyObjC_setDunderNew, NULL)
+OBJECT_PROP(_genericNewClass, PyObjC_genericNewClass, NULL)
 
 static PyObject*
 bundle_hack_get(PyObject* s __attribute__((__unused__)),
@@ -303,6 +304,8 @@ static PyGetSetDef options_getset[] = {
            "Private helper used for splitting a class dict into parts"),
     GETSET(_setDunderNew,
            "Private helper used for setting __new__ of a new Python subclass"),
+    GETSET(_genericNewClass,
+           "Class of the generic __new__ implementation"),
     {
         .name = "deprecation_warnings",
         .get  = deprecation_warnings_get,

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/pyobjc.h

@@ -6,7 +6,7 @@
  *
  */
 
-#define OBJC_VERSION "10.3"
+#define OBJC_VERSION "10.3.2"
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/test/coding.m

@@ -1,4 +1,3 @@
-#define Py_LIMITED_API 0x03060000
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pyobjc-api.h"

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Modules/objc/test/genericnew.m

@@ -39,6 +39,15 @@
     return self;
 }
 
+-(instancetype)initWithURL:(NSObject*)v
+{
+    self = [super init];
+    if (!self) return nil;
+
+    value = [v retain];
+    return self;
+}
+
 -(instancetype)initWithFirst:(NSObject*)first second:(NSObject*)second
 {
     self = [super init];

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-core
-Version: 10.3
+Version: 10.3.2
 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...

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/PyObjCTest/test_generic_new.py

@@ -7,6 +7,7 @@ from .genericnew import OC_GenericNew, OC_GenericNewChild, OC_GenericNewChild2
 NSObject = objc.lookUpClass("NSObject")
 
 objc.registerNewKeywordsFromSelector("OC_GenericNew", b"initWithValue:")
+objc.registerNewKeywordsFromSelector("OC_GenericNew", b"initWithURL:")
 objc.registerNewKeywordsFromSelector("OC_GenericNew", b"initWithFirst:second:")
 objc.registerNewKeywordsFromSelector("OC_GenericNewChild", b"initWithX:y:")
 objc.registerNewKeywordsFromSelector("OC_GenericNewChild2", b"initWithX:y:z:")
@@ -151,6 +152,9 @@ class TestDefaultNewForObjectiveCClass(TestCase):
         v = OC_GenericNew(value=42)
         self.assertEqual(v.value(), 42)
 
+        v = OC_GenericNew(URL=99)
+        self.assertEqual(v.value(), 99)
+
         v = OC_GenericNew(first=1, second=2)
         self.assertEqual(v.value(), ["first-second", 1, 2])
 

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/PyObjCTest/test_regr.py

@@ -361,6 +361,13 @@ class TestNSDataCreationIssue(TestCase):
         cls.alloc().initWithData_(b"hello")
 
 
+class TestNSIndexSetCreationIssue(TestCase):
+    def test_issue625(self):
+        cls = objc.lookUpClass("NSIndexSet")
+
+        cls.alloc().initWithIndex_(0)
+
+
 class TestTypedefedClass(TestCase):
     # Issue #298, see description in Modules/objc/module.m
     def test_typedefed(self):

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/PyObjCTest/test_splitsig.py

@@ -102,6 +102,7 @@ class SplitSignatureTest(TestCase):
             # Unclear why this signature isn't correct, possibly due to the 'queue'.
             # method is private anyway...
             "SCN_setupDisplayLinkWithQueue_screen_policy_",
+            "isNSURL__",
         ]
 
         for cls in objc.getClassList():
@@ -127,6 +128,7 @@ class SplitSignatureTest(TestCase):
                 if sel.selector.split(b":", 1)[0] in (
                     b"fm",
                     b"_fm",
+                    b"_ns",
                     b"_ax",
                     b"_scr",
                     b"CA_interpolateValues",
@@ -146,6 +148,8 @@ class SplitSignatureTest(TestCase):
                     b"ams",
                     b"safari",
                     b"vs",
+                    b"_swiftui",
+                    b"swiftui",
                 ) or sel.selector in (
                     b"isNSArray::",
                     b"isNSCFConstantString::",

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/PyObjCTest/test_subclass.py

@@ -1155,3 +1155,53 @@ class TestSuperUsage(TestCase):
                     def init(self):
                         self = super().init()
                         return self
+
+
+class OC_DunderInitBase(NSObject):
+    # Helper for ``TestUsingDunderInit``
+    def __new__(cls, *args, **kwds):
+        return cls.alloc().init()
+
+
+class TestUsingDunderInit(TestCase):
+    # Some users have an intermediate class
+    # which implements ``__new__`` to be able
+    # to create Cocoa sublcasses using a similar
+    # interface as normal Python subclasses, e.g.
+    # with ``__init__`` for initializing the instance.
+    #
+    # This should continue to work.
+
+    def test_using_dunder_init(self):
+        class OC_DunderInitSub1(OC_DunderInitBase):
+            def __init__(self, x, y=2):
+                self.x = x
+                self.y = y
+
+        o = OC_DunderInitSub1(x=1)
+        self.assertIsInstance(o, OC_DunderInitSub1)
+        self.assertEqual(o.x, 1)
+        self.assertEqual(o.y, 2)
+
+        with self.assertRaises(TypeError):
+            OC_DunderInitSub1()
+
+        with self.assertRaises(TypeError):
+            OC_DunderInitSub1(9, z=4)
+
+    def test_multipe_generations(self):
+        class OC_DunderInitSub2(OC_DunderInitBase):
+            def __init__(self, x, y):
+                self.x = x
+                self.y = y
+
+        class OC_DunderInitSub3(OC_DunderInitSub2):
+            def __init__(self, x, y, z):
+                super().__init__(x, y)
+                self.z = z
+
+        o = OC_DunderInitSub3(1, 2, 3)
+        self.assertIsInstance(o, OC_DunderInitSub3)
+        self.assertEqual(o.x, 1)
+        self.assertEqual(o.y, 2)
+        self.assertEqual(o.z, 3)

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/Tools/pyobjc_setup.py

@@ -22,11 +22,12 @@ import sys
 import tempfile
 import time
 import unittest
+from fnmatch import fnmatch
 from sysconfig import get_config_var, get_config_vars
 from setuptools import Command
 from setuptools import Extension as _Extension
 from setuptools import setup as _setup
-from setuptools.command import build_ext, build_py, develop, egg_info, install_lib, test
+from setuptools.command import build_ext, build_py, develop, egg_info, install_lib
 
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsPlatformError
@@ -84,18 +85,14 @@ class oc_egg_info(egg_info.egg_info):
             fp.write(last)
 
 
-class oc_test(test.test):
+class oc_test(Command):
     description = "run test suite"
-    user_options = test.test.user_options + [
-        ("verbosity=", None, "print what tests are run")
-    ]
+    user_options = [("verbosity=", None, "print what tests are run")]
 
     def initialize_options(self):
-        test.test.initialize_options(self)
         self.verbosity = "1"
 
     def finalize_options(self):
-        test.test.finalize_options(self)
         if isinstance(self.verbosity, str):
             self.verbosity = int(self.verbosity)
 
@@ -154,18 +151,14 @@ class oc_test(test.test):
         self.cleanup_environment()
         self.add_project_to_sys_path()
 
-        from pkg_resources import EntryPoint
-
-        loader_ep = EntryPoint.parse("x=" + self.test_loader)
-        loader_class = loader_ep.resolve()
-
         import warnings
 
         warnings.simplefilter("error")
+        warnings.filterwarnings("ignore", message=".*GIL.*", category=RuntimeWarning)
 
         try:
             time_before = time.time()
-            suite = loader_class().loadTestsFromName(self.distribution.test_suite)
+            suite = makeTestSuite()
 
             if self.verbose and self.verbosity < 3:
                 runner = unittest.TextTestRunner(verbosity=3)
@@ -511,21 +504,17 @@ def Extension(*args, **kwds):
             % (tuple(map(int, os_level.split(".")[:2])))
         )
 
-    # XCode 15 has a bug w.r.t. weak linking for older macOS versions,
-    # fall back to older linker when using that compiler.
-    # XXX: This should be in _fixup_compiler but doesn't work there...
-    lines = subprocess.check_output(["xcodebuild", "-version"], text=True).splitlines()
-    if lines[0].startswith("Xcode"):
-        xcode_vers = int(lines[0].split()[-1].split(".")[0])
-        if xcode_vers >= 15:
-            ldflags.append("-Wl,-ld_classic")
-
     if os_level == "10.4":
         cflags.append("-DNO_OBJC2_RUNTIME")
 
     if "-Werror" not in cflags:
         cflags.append("-Werror")
 
+    if get_config_var("Py_GIL_DISABLED"):
+        cflags.append("-DPyObjC_GIL_DISABLED")
+        if "py_limited_api" in kwds:
+            del kwds["py_limited_api"]
+
     if "extra_compile_args" in kwds:
         kwds["extra_compile_args"] = kwds["extra_compile_args"] + cflags
     else:
@@ -618,6 +607,10 @@ def setup(min_os_level=None, max_os_level=None, cmdclass=None, **kwds):
         # No extension modules, can build universal wheel
         k["options"] = {"bdist_wheel": {"universal": 1}}
 
+    if "options" in k and "bdist_wheel" in k["options"]:
+        if get_config_var("Py_GIL_DISABLED"):
+            del k["options"]["bdist_wheel"]
+
     plat_name = "MacOS X"
     plat_versions = []
     if min_os_level is not None and min_os_level == max_os_level:
@@ -675,3 +668,50 @@ def setup(min_os_level=None, max_os_level=None, cmdclass=None, **kwds):
         keywords=["PyObjC"] + [p for p in k["packages"] if p not in ("PyObjCTools",)],
         **k,
     )
+
+
+def recursiveGlob(root, pathPattern):
+    """
+    Recursively look for files matching 'pathPattern'. Return a list
+    of matching files/directories.
+    """
+    result = []
+
+    for rootpath, _dirnames, filenames in os.walk(root):
+        for fn in filenames:
+            if fnmatch(fn, pathPattern):
+                result.append(os.path.join(rootpath, fn))
+    return result
+
+
+def importExternalTestCases(pathPattern="test_*.py", root=".", package=None):
+    """
+    Import all unittests in the PyObjC tree starting at 'root'
+    """
+    testFiles = recursiveGlob(root, pathPattern)
+    testModules = [x[len(root) + 1 : -3].replace("/", ".") for x in testFiles]
+    if package is not None:
+        testModules = [(package + "." + m) for m in testModules]
+    suites = []
+    for modName in testModules:
+        try:
+            module = __import__(modName)
+        except ImportError as msg:
+            print(f"SKIP {modName}: {msg}")
+            continue
+        if "." in modName:
+            for elem in modName.split(".")[1:]:
+                module = getattr(module, elem)
+        s = unittest.defaultTestLoader.loadTestsFromModule(module)
+        suites.append(s)
+    return unittest.TestSuite(suites)
+
+
+gTopdir = os.path.dirname(__file__)
+
+
+def makeTestSuite():
+    plain_suite = importExternalTestCases(
+        "test_*.py", os.path.join(gTopdir, "PyObjCTest"), package="PyObjCTest"
+    )
+    return plain_suite

{pyobjc_core-10.3 → pyobjc_core-10.3.2}/setup.py

@@ -7,8 +7,8 @@ import tempfile
 import sys
 import subprocess
 import warnings
-from setuptools import Extension, setup
-from setuptools.command import build_ext, build_py, egg_info, install_lib, test
+from setuptools import Extension, setup, Command
+from setuptools.command import build_ext, build_py, egg_info, install_lib
 from distutils import log
 from distutils.errors import DistutilsError, DistutilsPlatformError, DistutilsSetupError
 from distutils.sysconfig import get_config_var as _get_config_var
@@ -213,18 +213,14 @@ class oc_build_py(build_py.build_py):
             self.packages = p
 
 
-class oc_test(test.test):
+class oc_test(Command):
     description = "run test suite"
-    user_options = test.test.user_options + [
-        ("verbosity=", None, "print what tests are run")
-    ]
+    user_options = [("verbosity=", None, "print what tests are run")]
 
     def initialize_options(self):
-        test.test.initialize_options(self)
         self.verbosity = "1"
 
     def finalize_options(self):
-        test.test.finalize_options(self)
         if isinstance(self.verbosity, str):
             self.verbosity = int(self.verbosity)