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

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

@@ -29,9 +29,7 @@ _usepool = not _os.environ.get("PYOBJC_NO_AUTORELEASE")
 
 
 def _typemap(tp):
-    if isinstance(tp, tuple):
-        return tuple(_typemap(x) for x in tp)
-    elif tp is None:
+    if tp is None:
         return None
     return (
         tp.replace(b"_NSRect", b"CGRect")
@@ -675,8 +673,8 @@ class TestCase(_unittest.TestCase):
             for item in tp:
                 if (
                     typestr == item
-                    or _typemap(typestr) == _typemap(tp)
-                    or _typealias.get(typestr, typestr) == _typealias.get(tp, tp)
+                    or _typemap(typestr) == _typemap(item)
+                    or _typealias.get(typestr, typestr) == _typealias.get(item, item)
                 ):
                     break
             else:
@@ -717,8 +715,8 @@ class TestCase(_unittest.TestCase):
             for item in tp:
                 if (
                     typestr == item
-                    or _typemap(typestr) == _typemap(tp)
-                    or _typealias.get(typestr, typestr) == _typealias.get(tp, tp)
+                    or _typemap(typestr) == _typemap(item)
+                    or _typealias.get(typestr, typestr) == _typealias.get(item, item)
                 ):
                     break
             else:
@@ -1386,62 +1384,37 @@ 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):
+        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(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(parent))
 
-            # The module_names list might contain duplicates
             module_names = sorted(set(module_names))
-        else:
-
-            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(True)
-                    if (not cls.__name__.startswith("_")) and ("." not in cls.__name__)
-                )
-                module_names.extend(getattr(getter, "_pyobjc_funcmap", None) or [])
-                todo = list(getter._pyobjc_parents)
-                while todo:
-                    parent = todo.pop()
-                    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(parent))
 
-                module_names = sorted(set(module_names))
-
-            else:
-                module_names = sorted(set(dir(module)))
+        else:
+            module_names = sorted(set(dir(module)))
 
         for _idx, nm in enumerate(module_names):
             # print(f"{_idx}/{len(module_names)} {nm}")
@@ -1452,18 +1425,16 @@ 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):
                 with objc.autorelease_pool():
                     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():
+                    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:
@@ -1481,8 +1452,8 @@ class TestCase(_unittest.TestCase):
                                 )
 
                     for attr_name, attr in value.pyobjc_classMethods.__dict__.items():
-                        if attr_name in exclude_method_names:
-                            continue
+                        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("_"):

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

@@ -98,8 +98,6 @@ class function_wrapper:
             )
         elif name == "__name__":
             return "__new__"
-        elif name == "__module__":
-            return self._cls.__module__
         return getattr(self._function, name)
 
     def __setattr__(self, name, value):

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

@@ -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.0 → pyobjc_core-12.1}/Lib/pyobjc_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobjc-core
-Version: 12.0
+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,7 +19,6 @@ 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
@@ -27,11 +26,11 @@ 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 :: 2 - Beta
+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-12.0 → pyobjc_core-12.1}/Lib/pyobjc_core.egg-info/SOURCES.txt

@@ -175,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
@@ -328,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
@@ -429,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
@@ -504,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-12.0/Modules/objc → pyobjc_core-12.1/Lib/pyobjc_core.egg-info/include}/pyobjc-compat.h

@@ -22,12 +22,14 @@ NS_ASSUME_NONNULL_BEGIN
  * Start of compiler definitions
  *
  */
+#if 0
 #ifndef __has_feature
 #define __has_feature(x) 0
 #endif
 #ifndef __has_extension
 #define __has_extension(x) __has_feature(x)
 #endif
+#endif
 
 #if __has_extension(c_static_assert)
 #define STATIC_ASSERT(test, message) _Static_assert(test, message)
@@ -59,42 +61,8 @@ NS_ASSUME_NONNULL_BEGIN
  * XXX: Are these needed?
  */
 
-#ifdef __GNUC__
 #define unlikely(x) __builtin_expect(!!(x), 0)
 #define likely(x) __builtin_expect(!!(x), 1)
-#else
-#define likely(x) x
-#define likely(x) x
-#endif
-
-/* On some versions of GCC <limits.h> defines LONG_LONG_MAX but not LLONG_MAX, compensate.
- */
-#ifndef LLONG_MIN
-#ifdef LONG_LONG_MIN
-#define LLONG_MIN LONG_LONG_MIN
-#define LLONG_MAX LONG_LONG_MAX
-#define ULLONG_MAX ULONG_LONG_MAX
-#endif
-#endif
-
-/*
- *
- * End of compiler support helpers
- *
- * XXX: These two are no longer needed, all supported platforms
- *      are 64-bit
- */
-
-#if __LP64__
-#define Py_ARG_NSInteger "l"
-#define Py_ARG_NSUInteger "k"
-#else
-#define Py_ARG_NSInteger "i"
-#define Py_ARG_NSUInteger "I"
-#endif
-
-#define PyObjC__STR(x) #x
-#define PyObjC_STR(x) PyObjC__STR(x)
 
 /*
  *
@@ -131,20 +99,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 extern int PyObjC_Cmp(PyObject* o1, PyObject* o2, int* result);
 
-/*
- * A micro optimization: when using Python 3.3 or later it
- * is possible to access a 'char*' with an ASCII representation
- * of a unicode object without first converting it to a bytes
- * string (if the string can be encoded as ASCII in the first
- * place.
- *
- * This slightly reduces the object allocation rate during
- * attribute access.
- *
- * XXX: Use PyUnicode_AsUTF8 instead.
- */
-extern const char* _Nullable PyObjC_Unicode_Fast_Bytes(PyObject* object);
-
 #ifdef __clang__
 
 #ifndef Py_LIMITED_API
@@ -286,6 +240,23 @@ static inline PyObject* _Nullable PyList_GetItemRef(PyObject* l, Py_ssize_t i)
     Py_XINCREF(result);
     return result;
 }
+
+static inline int
+PyDict_SetDefaultRef(PyObject* p, PyObject* key, PyObject* default_value,
+                     PyObject* _Nonnull* _Nullable result)
+{
+    *result = PyDict_SetDefault(p, key, default_value);
+    if (*result == NULL) {
+        return -1;
+    }
+    Py_INCREF(*result);
+
+    /* This does not follow the spec, should return 1 when the key was already
+     * in the dict. That part of the API is not used in PyObjC though.
+     */
+    return 0;
+}
+
 #endif
 
 #if PY_VERSION_HEX < 0x030c0000

pyobjc_core-12.1/Lib/pyobjc_core.egg-info/pyobjc-build-info.txt

@@ -0,0 +1,3 @@
+macOS 26.1 (25B77)
+Apple clang version 17.0.0 (clang-1700.4.4.1)
+SDK: macOS 26.1

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonArray.h

@@ -19,7 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
  *              can be used everywhere where NSArray or NSMutableArray objects
  *              are expected.
  */
-/* XXX: Cannot be PyObjC_FINAL_CLASS */
 @interface OC_PythonArray : NSMutableArray {
     PyObject* value;
 }

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonArray.m

@@ -58,16 +58,8 @@ NS_ASSUME_NONNULL_BEGIN
 
     PyObjC_BEGIN_WITH_GIL
 
-        /* XXX: This is different from other proxies
-         *      to make it easier to hit a race in
-         *      proxy-registry.m for testing.
-         *
-         *      With the current implementation of
-         *      proxy-registry (using weak refs) either
-         *      order works correctly.
-         */
         PyObjC_UnregisterObjCProxy(value, self);
-        Py_XDECREF(value);
+        Py_CLEAR(value);
 
     PyObjC_END_WITH_GIL
 

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonData.h

@@ -17,7 +17,6 @@
  */
 NS_ASSUME_NONNULL_BEGIN
 
-/* XXX: Cannot be PyObjC_FINAL_CLASS */
 @interface OC_PythonData : NSMutableData {
     PyObject* value;
 }

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonDate.h

@@ -1,6 +1,5 @@
 NS_ASSUME_NONNULL_BEGIN
 
-/* XXX: Cannot be PyObjC_FINAL_CLASS */
 @interface OC_PythonDate : NSDate {
     NSTimeInterval timeSinceEpoch;
     PyObject*      value;

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonDictionary.h

@@ -21,7 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
  *      PyMapping_* API is not flexible enough, and most sequence also implement
  *      the generic mapping interface to deal with slices.
  */
-/* XXX: Cannot be PyObjC_FINAL_CLASS */
 @interface OC_PythonDictionary : NSMutableDictionary {
     PyObject* _Nonnull value;
 }

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonDictionary.m

@@ -342,10 +342,16 @@ PyObjC_FINAL_CLASS @interface OC_PythonDictionaryEnumerator : NSEnumerator {
 
 - (NSEnumerator*)keyEnumerator
 {
-    if (value && PyDict_CheckExact(value)) {
+    if (value == NULL) { // LCOV_BR_EXCL_LINE
+        /* Value could be NULL during ``initWithCoder:``, but AFAIK it
+         * is not possible to invoke arbitrary methods in that state.
+         */
+        return nil; // LCOV_EXCL_LINE
+    } else if (PyDict_CheckExact(value)) {
         return [OC_PythonDictionaryEnumerator enumeratorWithWrappedDictionary:self];
 
     } else {
+        NSEnumerator* result = nil;
         PyObjC_BEGIN_WITH_GIL
             PyObject* args[2] = {NULL, value};
 
@@ -361,10 +367,10 @@ PyObjC_FINAL_CLASS @interface OC_PythonDictionaryEnumerator : NSEnumerator {
                 PyObjC_GIL_FORWARD_EXC();
             } // LCOV_EXCL_LINE
 
-            NSEnumerator* result = [OC_PythonEnumerator enumeratorWithPythonObject:iter];
-            PyObjC_GIL_RETURN(result);
+            result = [OC_PythonEnumerator enumeratorWithPythonObject:iter];
 
         PyObjC_END_WITH_GIL
+        return result;
     }
 }
 
@@ -445,8 +451,13 @@ PyObjC_FINAL_CLASS @interface OC_PythonDictionaryEnumerator : NSEnumerator {
     PyObjC_BEGIN_WITH_GIL
         PyObject* v = id_to_python(other);
 
-        if (v != NULL) {
-            SET_FIELD(value, v);
+        /* 'other' is a serialized python mapping value
+         * (not a 'real' Cocoa instance). Those can
+         * always be converted back into the corresponding
+         * Python value.
+         */
+        if (v != NULL) {         // LCOV_BR_EXCL_LINE
+            SET_FIELD(value, v); // LCOV_EXCL_LINE
         }
     PyObjC_END_WITH_GIL
 }
@@ -514,7 +525,7 @@ PyObjC_FINAL_CLASS @interface OC_PythonDictionaryEnumerator : NSEnumerator {
 
 - (Class)classForCoder
 {
-    if (value && PyDict_CheckExact(value)) {
+    if (value && PyDict_CheckExact(value)) { // LCOV_BR_EXCL_LINE
         return [NSMutableDictionary class];
     } else {
         return [OC_PythonDictionary class];

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonNumber.h

@@ -1,6 +1,5 @@
 NS_ASSUME_NONNULL_BEGIN
 
-/* XXX: Cannot be PyObjC_FINAL_CLASS */
 @interface OC_PythonNumber : NSNumber {
     PyObject* value;
 }

{pyobjc_core-12.0 → pyobjc_core-12.1}/Modules/objc/OC_PythonNumber.m

@@ -77,13 +77,11 @@ NS_ASSUME_NONNULL_BEGIN
                 PyObjC_GIL_RETURN(@encode(unsigned long long));
             } // LCOV_EXCL_LINE
             PyErr_Clear();
-
-            /* Wrap on overflow */
-            PyObjC_GIL_RETURN(@encode(long long));
         }
     PyObjC_END_WITH_GIL
 
-    __builtin_unreachable(); // LCOV_EXCL_LINE
+    /* Wrap on overflow */
+    return @encode(long long);
 }
 
 - (void)getValue:(void*)buffer
@@ -207,19 +205,11 @@ NS_ASSUME_NONNULL_BEGIN
         if (PyFloat_Check(value)) {
             double float_result = PyFloat_AsDouble(value);
             result              = (long long)float_result;
-            PyObjC_GIL_RETURN(result);
         } else {
             result = PyLong_AsUnsignedLongLongMask(value);
-            PyObjC_GIL_RETURN(result);
         }
     PyObjC_END_WITH_GIL
-
-    // LCOV_EXCL_START
-    @throw
-        [NSException exceptionWithName:NSInvalidArgumentException
-                                reason:@"Cannot determine objective-C type of this number"
-                              userInfo:nil];
-    // LCOV_EXCL_STOP
+    return result;
 }
 
 - (unsigned long long)unsignedLongLongValue
@@ -235,7 +225,6 @@ NS_ASSUME_NONNULL_BEGIN
     PyObjC_BEGIN_WITH_GIL
         if (PyLong_Check(value)) {
             result = PyLong_AsUnsignedLongLongMask(value);
-            PyObjC_GIL_RETURN(result);
         } else if (PyFloat_Check(value)) {
             double temp = PyFloat_AsDouble(value);
             if (temp < 0) {
@@ -251,16 +240,17 @@ NS_ASSUME_NONNULL_BEGIN
             } else {
                 result = (unsigned long long)temp;
             }
-            PyObjC_GIL_RETURN(result);
-        } // LCOV_BR_EXCL_LINE
+        } else {
+            // LCOV_EXCL_START
+            @throw [NSException
+                exceptionWithName:NSInvalidArgumentException
+                           reason:@"Cannot determine objective-C type of this number"
+                         userInfo:nil];
+            // LCOV_EXCL_STOP
+        }
     PyObjC_END_WITH_GIL
 
-    // LCOV_EXCL_START
-    @throw
-        [NSException exceptionWithName:NSInvalidArgumentException
-                                reason:@"Cannot determine objective-C type of this number"
-                              userInfo:nil];
-    // LCOV_EXCL_STOP
+    return result;
 }
 
 - (NSString*)description
@@ -401,6 +391,7 @@ NS_ASSUME_NONNULL_BEGIN
         }
     }
 
+    NSComparisonResult rv;
     PyObjC_BEGIN_WITH_GIL
         PyObject* other = id_to_python(number);
         int       r, ok;
@@ -416,19 +407,21 @@ NS_ASSUME_NONNULL_BEGIN
         } // LCOV_EXCL_LINE
 
         if (r < 0) {
-            PyObjC_GIL_RETURN(NSOrderedAscending);
+            rv = NSOrderedAscending;
         } else if (r > 0) {
-            PyObjC_GIL_RETURN(NSOrderedDescending);
-        } else { // LCOV_EXCL_LINE
-            PyObjC_GIL_RETURN(NSOrderedSame);
+            rv = NSOrderedDescending;
+        } else {
+            rv = NSOrderedSame;
         }
 
     PyObjC_END_WITH_GIL
+    return rv;
 }
 
 #define COMPARE_METHOD(NAME, OPERATOR)                                                   \
     -(BOOL)NAME : (NSObject* _Nullable)number                                            \
     {                                                                                    \
+        BOOL rv;                                                                         \
         PyObjC_BEGIN_WITH_GIL                                                            \
             PyObject* other = id_to_python(number);                                      \
             int       r;                                                                 \
@@ -443,12 +436,13 @@ NS_ASSUME_NONNULL_BEGIN
             } /* LCOV_EXCL_LINE */                                                       \
                                                                                          \
             if (r) {                                                                     \
-                PyObjC_GIL_RETURN(YES);                                                  \
+                rv = YES;                                                                \
             } else { /* LCOV_EXCL_LINE */                                                \
-                PyObjC_GIL_RETURN(NO);                                                   \
+                rv = NO;                                                                 \
             }                                                                            \
                                                                                          \
         PyObjC_END_WITH_GIL                                                              \
+        return rv;                                                                       \
     }
 
 COMPARE_METHOD(isEqualTo, Py_EQ)
@@ -465,13 +459,14 @@ COMPARE_METHOD(isLessThanOrEqualTo, Py_LE)
 
 - (Class)classForArchiver
 {
+    Class result;
     PyObjC_BEGIN_WITH_GIL
         @try {
             if (PyFloat_CheckExact(value)) {
                 /* Float is a C double and can be roundtripped using
                  * NSNumber.
                  */
-                PyObjC_GIL_RETURN([NSNumber class]);
+                result = [NSNumber class];
             } else if (PyLong_CheckExact(value)) {
                 /* If the value fits inside a long long or
                  * unsigned long long encode as an NSNumber,
@@ -482,21 +477,21 @@ COMPARE_METHOD(isLessThanOrEqualTo, Py_LE)
                  */
                 (void)PyLong_AsLongLong(value);
                 if (!PyErr_Occurred()) {
-                    PyObjC_GIL_RETURN([NSNumber class]);
+                    result = [NSNumber class];
                 } else { // LCOV_EXCL_LINE
                     PyErr_Clear();
 
                     (void)PyLong_AsUnsignedLongLong(value);
                     if (!PyErr_Occurred()) {
-                        PyObjC_GIL_RETURN([NSNumber class]);
+                        result = [NSNumber class];
                     } else { // LCOV_EXCL_LINE
                         PyErr_Clear();
 
-                        PyObjC_GIL_RETURN([self class]);
+                        result = [self class];
                     }
                 }
             } else { // LCOV_EXCL_LINE
-                PyObjC_GIL_RETURN([self class]);
+                result = [self class];
             }
 
             // LCOV_EXCL_START
@@ -506,7 +501,8 @@ COMPARE_METHOD(isLessThanOrEqualTo, Py_LE)
         }
         // LCOV_EXCL_STOP
     PyObjC_END_WITH_GIL
-}
+    return result;
+} // LCOV_EXCL_LINE
 
 - (Class _Nullable)classForKeyedArchiver
 {
@@ -525,11 +521,32 @@ COMPARE_METHOD(isLessThanOrEqualTo, Py_LE)
 
 - (id)copyWithZone:(NSZone* _Nullable)__attribute__((__unused__)) zone
 {
-    /* XXX: This is ok if value is a python builtin
-     *      but not for arbitrary python objects.
-     */
-    [self retain];
-    return self;
+    id result;
+    PyObjC_BEGIN_WITH_GIL
+        if (PyLong_CheckExact(value) || PyFloat_CheckExact(value)
+            || Py_TYPE(value) == &PyBool_Type) {
+            /* The value is immutable, no need to copy */
+            result = self;
+        } else {
+            /* The value might be mutable, perform a copy */
+            PyObject* copied = PyObjC_Copy(value);
+            if (copied == NULL) {
+                PyObjC_GIL_FORWARD_EXC();
+            } // LCOV_EXCL_LINE
+
+            if (depythonify_python_object(copied, &result) == -1) {
+                Py_CLEAR(copied);
+                PyObjC_GIL_FORWARD_EXC();
+            } // LCOV_EXCL_LINE
+            Py_CLEAR(copied);
+        }
+
+        /* The result of copy should have +1 retainCount */
+        [result retain];
+
+    PyObjC_END_WITH_GIL
+
+    return result;
 }
 
 @end