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

{pyobjc_core-10.3 → pyobjc_core-10.3.1}/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.1}/Lib/pyobjc_core.egg-info/PKG-INFO

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

{pyobjc_core-10.3 → pyobjc_core-10.3.1}/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;
 }
 
 

{pyobjc_core-10.3 → pyobjc_core-10.3.1}/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.1}/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.1}/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.1}/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.1}/Modules/objc/pyobjc.h

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

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

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

{pyobjc_core-10.3 → pyobjc_core-10.3.1}/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)