pyobjc-core 10.1__tar.gz → 10.2__tar.gz

{pyobjc-core-10.1 → pyobjc-core-10.2}/Lib/PyObjCTools/TestSupport.py

@@ -1229,13 +1229,16 @@ class TestCase(_unittest.TestCase):
                 )
 
         if exclude_cocoa:
-            import Cocoa
+            try:
+                import Cocoa
 
-            exclude_names = set(dir(Cocoa))
+                exclude_names = set(dir(Cocoa))
 
-            # Don't exclude NSObject' because a number
-            # of frameworks define categories on this class.
-            exclude_names -= {"NSObject"}
+                # Don't exclude NSObject' because a number
+                # of frameworks define categories on this class.
+                exclude_names -= {"NSObject"}
+            except ImportError:
+                exclude_names = set()
         else:
             exclude_names = set()
 

{pyobjc-core-10.1 → pyobjc-core-10.2}/Lib/objc/_bridges.py

@@ -1,5 +1,6 @@
 import collections.abc
 import datetime
+import pathlib
 
 from objc import _objc
 
@@ -8,6 +9,7 @@ __all__ = [
     "registerMappingType",
     "registerSetType",
     "registerDateType",
+    "registerPathType",
 ]
 
 _objc.options._datetime_date_type = datetime.date
@@ -58,6 +60,17 @@ def registerDateType(type_object):
     _objc.options._date_types += (type_object,)
 
 
+def registerPathType(type_object):
+    """
+    Register 'type' as a date-like type that will be proxied
+    as an NSDate subclass.
+    """
+    if _objc.options._path_types is None:
+        _objc.options._path_types = ()
+
+    _objc.options._path_types += (type_object,)
+
+
 registerListType(collections.abc.Sequence)
 registerListType(range)
 registerMappingType(collections.abc.Mapping)
@@ -67,3 +80,4 @@ registerSetType(frozenset)
 registerSetType(collections.abc.Set)
 registerDateType(datetime.date)
 registerDateType(datetime.datetime)
+registerPathType(pathlib.Path)

{pyobjc-core-10.1 → pyobjc-core-10.2}/Lib/objc/_properties.py

@@ -248,7 +248,7 @@ class object_property:
             )
             signature = _C_NSBOOL + b"@:N^@o^@"
             validate = selector(self._validate, selector=selName, signature=signature)
-            class_dict[validate.selector] = validate
+            class_dict[validate.selector.decode().replace(":", "_")] = validate
             instance_methods.add(validate)
 
         if self._depends_on:
@@ -266,7 +266,7 @@ class object_property:
                 signature=b"@@:",
                 isClassMethod=True,
             )
-            class_dict[affecting.selector] = affecting
+            class_dict[affecting.selector.decode().replace(":", "_")] = affecting
             class_methods.add(affecting)
 
     def __get__(self, an_object, owner):

{pyobjc-core-10.1 → pyobjc-core-10.2}/Lib/pyobjc_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobjc-core
-Version: 10.1
+Version: 10.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.1 → pyobjc-core-10.2}/Lib/pyobjc_core.egg-info/SOURCES.txt

@@ -110,6 +110,8 @@ Modules/objc/OC_PythonObject.h
 Modules/objc/OC_PythonObject.m
 Modules/objc/OC_PythonSet.h
 Modules/objc/OC_PythonSet.m
+Modules/objc/OC_PythonURL.h
+Modules/objc/OC_PythonURL.m
 Modules/objc/OC_PythonUnicode.h
 Modules/objc/OC_PythonUnicode.m
 Modules/objc/ObjCPointer.h
@@ -472,6 +474,7 @@ PyObjCTest/test_transform.py
 PyObjCTest/test_transform_integration.py
 PyObjCTest/test_typecheck.py
 PyObjCTest/test_unicode.py
+PyObjCTest/test_urlproxy.py
 PyObjCTest/test_usekvo.py
 PyObjCTest/test_varargs.py
 PyObjCTest/test_varlist.py

{pyobjc-core-10.1 → pyobjc-core-10.2}/License.txt

@@ -1,7 +1,7 @@
 (This is the MIT license, note that libffi-src is a separate product with its own license)
 
 Copyright 2002, 2003 - Bill Bumgarner, Ronald Oussoren, Steve Majewski, Lele Gaifax, et.al.
-Copyright 2003-2022 - Ronald Oussoren
+Copyright 2003-2024 - Ronald Oussoren
 
  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/OC_PythonNumber.m

@@ -123,7 +123,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)boolValue
 {
-    return (BOOL)PyObject_IsTrue(value);
+    int         r;
+    PyObjC_BEGIN_WITH_GIL
+        r = PyObject_IsTrue(value);
+        if (r == -1) {
+            PyObjC_GIL_FORWARD_EXC();
+        }
+    PyObjC_END_WITH_GIL
+
+    return !!r;
 }
 
 - (char)charValue
@@ -209,12 +217,19 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (long long)longLongValue
+  /* Disable float-cast-overflow checking when running
+   * with undefined behaviour sanitizer. The float cast
+   * below can result in undefined behaviour but is
+   * necessary to match Cocoa semantics.
+   */
+  __attribute__((no_sanitize("float-cast-overflow")))
 {
     long long result;
 
     PyObjC_BEGIN_WITH_GIL
         if (PyFloat_Check(value)) {
-            result = (long long)PyFloat_AsDouble(value);
+            double float_result = PyFloat_AsDouble(value);
+            result = (long long)float_result;
             PyObjC_GIL_RETURN(result);
         } else if (PyLong_Check(value)) {
             result = PyLong_AsUnsignedLongLongMask(value);
@@ -231,6 +246,12 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (unsigned long long)unsignedLongLongValue
+  /* Disable float-cast-overflow checking when running
+   * with undefined behaviour sanitizer. The float cast
+   * below can result in undefined behaviour but is
+   * necessary to match Cocoa semantics.
+   */
+  __attribute__((no_sanitize("float-cast-overflow")))
 {
     unsigned long long result;
 

pyobjc-core-10.2/Modules/objc/OC_PythonURL.h

@@ -0,0 +1,14 @@
+NS_ASSUME_NONNULL_BEGIN
+
+PyObjC_FINAL_CLASS
+@interface OC_PythonURL : NSURL {
+    PyObject* value;
+}
+
++ (instancetype _Nullable)URLWithPythonObject:(PyObject*)value;
+- (id _Nullable)initWithPythonObject:(PyObject*)value;
+- (PyObject*)__pyobjc_PythonObject__;
+
+@end
+
+NS_ASSUME_NONNULL_END

pyobjc-core-10.2/Modules/objc/OC_PythonURL.m

@@ -0,0 +1,128 @@
+#include "pyobjc.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation OC_PythonURL
+
++ (instancetype _Nullable)URLWithPythonObject:(PyObject*)object
+{
+    return [[[self alloc] initWithPythonObject:object] autorelease];
+}
+
+- (id _Nullable)initWithPythonObject:(PyObject*)object
+{
+    PyObject* fspath = PyOS_FSPath(object);
+    if (fspath == NULL) {
+        return nil;
+    }
+    if (!PyUnicode_Check(fspath)) {
+        Py_DECREF(fspath);
+        PyErr_Format(PyExc_ValueError, "os.fspath(%R) did not return a string", object);
+        return nil;
+    }
+
+    const char* utf8;
+    Py_ssize_t utf8_size;
+
+    utf8 = PyUnicode_AsUTF8AndSize(fspath, &utf8_size);
+    if (utf8 == NULL) {
+        Py_DECREF(fspath);
+        return nil;
+    }
+    if (utf8_size != (Py_ssize_t)strlen(utf8)) {
+        Py_DECREF(fspath);
+        PyErr_Format(PyExc_ValueError, "os.fspath(%R) result has embedded NULs", object);
+        return nil;
+    }
+
+    NSString* path = [[NSString alloc] initWithUTF8String:utf8];
+    Py_DECREF(fspath);
+    if (path == nil) {
+        return nil;
+    }
+
+    self = [super initFileURLWithPath:path];
+    [path release];
+    if (self == nil) {
+        return nil;
+    }
+
+    SET_FIELD_INCREF(value, object);
+    return self;
+}
+
+- (oneway void)release
+{
+    /* See comment in OC_PythonUnicode */
+    if (unlikely(!Py_IsInitialized())) { // LCOV_BR_EXCL_LINE
+        // LCOV_EXCL_START
+        [super release];
+        return;
+        // LCOV_EXCL_STOP
+    }
+
+    PyObjC_BEGIN_WITH_GIL
+        @try {
+            [super release];
+            // LCOV_EXCL_START
+        } @catch (NSObject* exc) {
+            /* I'm 99% sure this path cannot be hit,
+             * this class cannot be subclassesed and
+             * -dealloc cannot raise.
+             */
+            PyObjC_LEAVE_GIL;
+            @throw;
+        }
+        // LCOV_EXCL_STOP
+
+    PyObjC_END_WITH_GIL
+}
+
+- (void)dealloc
+{
+    if (unlikely(!Py_IsInitialized())) { // LCOV_BR_EXCL_LINE
+        // LCOV_EXCL_START
+        [super dealloc];
+        return;
+        // LCOV_EXCL_STOP
+    }
+
+    PyObjC_BEGIN_WITH_GIL
+        Py_XDECREF(value);
+    PyObjC_END_WITH_GIL
+
+    [super dealloc];
+}
+
+/*
+ * NSURL implements safe coding, that's something we cannot
+ * do for arbitrary python objects. Therefore punt and encode
+ * as a regular NSURL.
+ */
+- (Class)classForCoder
+{
+    return [NSURL class];
+}
+
+- (Class _Nullable)classForKeyedArchiver
+{
+    return [NSURL class];
+}
+
+
+- (PyObject*)__pyobjc_PythonObject__
+{
+    Py_XINCREF(value);
+    return value;
+}
+
+- (PyObject*)__pyobjc_PythonTransient__:(int*)cookie
+{
+    *cookie = 0;
+    Py_XINCREF(value);
+    return value;
+}
+@end
+
+
+
+NS_ASSUME_NONNULL_END

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/OC_PythonUnicode.m

@@ -180,12 +180,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)getCharacters:(unichar*)buffer range:(NSRange)aRange
 {
-    return [[self __realObject__] getCharacters:buffer range:aRange];
+    [[self __realObject__] getCharacters:buffer range:aRange];
 }
 
 - (void)getCharacters:(unichar*)buffer
 {
-    return [[self __realObject__] getCharacters:buffer];
+    [[self __realObject__] getCharacters:buffer];
 }
 
 /*

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/block_support.m

@@ -385,7 +385,7 @@ error:
 static void
 PyObjCBlock_CleanupCapsule(PyObject* ptr)
 {
-    void* block_func = PyCapsule_GetPointer(ptr, "objc.__block_release__");
+    PyObjCBlockFunction block_func = (PyObjCBlockFunction)PyCapsule_GetPointer(ptr, "objc.__block_release__");
     if (block_func == NULL)
         return;
 
@@ -458,7 +458,7 @@ void* _Nullable PyObjCBlock_Create(PyObjCMethodSignature* signature, PyObject* c
     }
     block->invoke = block_func;
 
-    block->invoke_cleanup = PyCapsule_New(block->invoke, "objc.__block_release__",
+    block->invoke_cleanup = PyCapsule_New((void*)(block->invoke), "objc.__block_release__",
                                           PyObjCBlock_CleanupCapsule);
     if (block->invoke_cleanup == NULL) {            // LCOV_BR_EXCL_LINE
         PyObjCFFI_FreeBlockFunction(block->invoke); // LCOV_EXCL_LINE

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/bundle-variables.m

@@ -387,7 +387,7 @@ PyObject* _Nullable PyObjC_loadFunctionList(PyObject* self __attribute__((__unus
     len = PySequence_Fast_GET_SIZE(seq);
     for (i = 0; i < len; i++) {
         PyObject* item = PySequence_Fast_GET_ITEM(seq, i);
-        void*     value;
+        function  value;
         char*     signature;
         PyObject* name;
         PyObject* doc;
@@ -417,7 +417,7 @@ PyObject* _Nullable PyObjC_loadFunctionList(PyObject* self __attribute__((__unus
             }
 
         } else {
-            PyObject* py_val = PyObjCFunc_New(name, value, signature, doc, meta);
+            PyObject* py_val = PyObjCFunc_New(name, (void*)value, signature, doc, meta);
             if (py_val == NULL) {
                 Py_DECREF(seq);
                 return NULL;

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/formal-protocol.m

@@ -185,7 +185,7 @@ static PyObject* _Nullable proto_new(PyTypeObject* type __attribute__((__unused_
 
                 protocol_addMethodDescription(
                     theProtocol, theSel, theSignature,
-                    (BOOL)PyObjCSelector_Required(PyTuple_GET_ITEM(sel, i)),
+                    !!PyObjCSelector_Required(PyTuple_GET_ITEM(sel, i)),
                     PyObjCSelector_IsClassMethod(PyTuple_GET_ITEM(sel, i)) ? NO : YES);
             }
 
@@ -199,7 +199,7 @@ static PyObject* _Nullable proto_new(PyTypeObject* type __attribute__((__unused_
             }
 
             protocol_addMethodDescription(theProtocol, theSel, theSignature,
-                                          (BOOL)PyObjCSelector_Required(sel),
+                                          !!PyObjCSelector_Required(sel),
                                           PyObjCSelector_IsClassMethod(sel) ? NO : YES);
         }
     }

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/libffi_extra.m

@@ -39,7 +39,7 @@ alloc_prepped_closure(ffi_closure** cl, ffi_cif* cif, void** codeloc, void* func
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
 
-    rv = ffi_prep_closure_loc(*cl, cif, func, userdata, *codeloc);
+    rv = ffi_prep_closure_loc(*cl, cif, (void (*)(ffi_cif *, void *, void **, void *))func, userdata, *codeloc);
 
 #pragma clang diagnostic pop
 
@@ -48,12 +48,12 @@ alloc_prepped_closure(ffi_closure** cl, ffi_cif* cif, void** codeloc, void* func
 #if PyObjC_BUILD_RELEASE >= 1015
 
     if (@available(macOS 10.15, *)) { // LCOV_BR_EXCL_LINE
-        rv = ffi_prep_closure_loc(*cl, cif, func, userdata, *codeloc);
+        rv = ffi_prep_closure_loc(*cl, cif, (void (*)(ffi_cif *, void *, void **, void *))func, userdata, *codeloc);
     } else {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
-        rv = ffi_prep_closure(*cl, cif, func, userdata);
+        rv = ffi_prep_closure(*cl, cif, (void (*)(ffi_cif *, void *, void **, void *))func, userdata);
 
 #pragma clang diagnostic pop
     }

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/libffi_support.m

@@ -2719,7 +2719,7 @@ PyObjCFFI_CountArguments(PyObjCMethodSignature* methinfo, Py_ssize_t argOffset,
 static void
 imp_capsule_cleanup(PyObject* ptr)
 {
-    PyObjCFFI_FreeIMP(PyCapsule_GetPointer(ptr, "objc.__imp__"));
+    PyObjCFFI_FreeIMP((IMP)PyCapsule_GetPointer(ptr, "objc.__imp__"));
 }
 
 static void
@@ -3027,7 +3027,7 @@ PyObjCFFI_ParseArguments(PyObjCMethodSignature* methinfo, Py_ssize_t argOffset,
                                         return -1;
                                     }
                                     byref_attr[i].obj = PyCapsule_New(
-                                        closure, "objc.__imp__", imp_capsule_cleanup);
+                                        (void*)closure, "objc.__imp__", imp_capsule_cleanup);
                                 } else {
                                     PyErr_SetString(
                                         PyExc_TypeError,
@@ -3040,7 +3040,7 @@ PyObjCFFI_ParseArguments(PyObjCMethodSignature* methinfo, Py_ssize_t argOffset,
                                     PyErr_SetString(PyExc_TypeError,
                                                     "Invalid pyobjc_closure attribute");
                                 }
-                                closure = PyCapsule_GetPointer(v, "objc.__imp__");
+                                closure = (PyObjC_callback_function)PyCapsule_GetPointer(v, "objc.__imp__");
                                 if (closure == NULL) {
                                     PyErr_SetString(PyExc_TypeError,
                                                     "Invalid pyobjc_closure attribute");
@@ -3302,7 +3302,7 @@ PyObjCFFI_ParseArguments(PyObjCMethodSignature* methinfo, Py_ssize_t argOffset,
                                     return -1;
                                 }
 
-                                byref_attr[i].obj = PyCapsule_New(closure, "objc.__imp__",
+                                byref_attr[i].obj = PyCapsule_New((void*)closure, "objc.__imp__",
                                                                   imp_capsule_cleanup);
 
                             } else {
@@ -3318,7 +3318,7 @@ PyObjCFFI_ParseArguments(PyObjCMethodSignature* methinfo, Py_ssize_t argOffset,
                                                 "Invalid pyobjc_closure attribute");
                             }
 
-                            closure = PyCapsule_GetPointer(v, "objc.__imp__");
+                            closure = (PyObjC_callback_function)PyCapsule_GetPointer(v, "objc.__imp__");
                             if (closure == NULL) {
                                 PyErr_SetString(PyExc_TypeError,
                                                 "Invalid pyobjc_closure attribute");
@@ -5117,7 +5117,7 @@ IMP _Nullable PyObjCFFI_MakeClosure(PyObjCMethodSignature* methinfo,
     }
 
     if ( // LCOV_BR_EXCL_LINE
-        alloc_prepped_closure(&cl, cif, &codeloc, func, userdata) == -1) {
+        alloc_prepped_closure(&cl, cif, &codeloc, (void*)func, userdata) == -1) {
         // LCOV_EXCL_START
         PyErr_SetString(PyObjCExc_Error, "Cannot create libffi closure");
         return NULL;
@@ -5140,7 +5140,7 @@ PyObjCFFI_FreeClosure(IMP closure)
     ffi_cif* cif;
     void*    userdata;
 
-    free_closure_from_codeloc(closure, &cif, &userdata);
+    free_closure_from_codeloc((void*)closure, &cif, &userdata);
     PyObjCFFI_FreeCIF(cif);
     return userdata;
 }

{pyobjc-core-10.1 → pyobjc-core-10.2}/Modules/objc/module.m

@@ -1361,7 +1361,7 @@ static PyObject* _Nullable _makeClosure(PyObject* self __attribute__((__unused__
         return NULL;
     }
 
-    PyObject* retval = PyCapsule_New(result, "objc.__imp__", _callback_cleanup);
+    PyObject* retval = PyCapsule_New((void*)result, "objc.__imp__", _callback_cleanup);
     if (retval == NULL) {
         PyObjCFFI_FreeIMP((IMP)result);
         return NULL;