Some last minute fixes, in particular a crash in pyobjc-core in an er…

…ror case
ronaldoussoren · Jun 6, 2023 · db17b71 · db17b71
1 parent fd84182
commit db17b71
Show file tree

Hide file tree

Showing 90 changed files with 533 additions and 4 deletions.
diff --git a/docs/_templates/index.html b/docs/_templates/index.html
@@ -17,7 +17,7 @@ <h1>Introduction</h1>
   <tr valign="top">
     <td width="60%">
       <h1>Release information</h1>
-      <p><b>PyObjC 9.2</b> was released on 2023-05-29. See the
+      <p><b>PyObjC 9.2</b> was released on 2023-06-06. See the
          <a href="{{ pathto("changelog") }}">changelog</a> for more information.
 	 PyObjC 9 supports Python 3.7 and later.</p>
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,7 +16,7 @@ in pure Python. See our tutorial for an example of this.
 Release information
 -------------------
 
-PyObjC 9.2 was released on 2023-05-29. See the :doc:`changelog <changelog>` for more information. PyObjC 9 supports Python 3.7 and later.
+PyObjC 9.2 was released on 2023-06-06. See the :doc:`changelog <changelog>` for more information. PyObjC 9 supports Python 3.7 and later.
 
 PyObjC 8.5 is the last version supporting Python 3.6. PyObjC 5.3 is the last version supporting Python 2. These versions are
 no longer supported.

diff --git a/pyobjc-core/Modules/objc/super-call.m b/pyobjc-core/Modules/objc/super-call.m
@@ -412,12 +412,27 @@ PyObjC_CallFunc _Nullable PyObjC_FindCallFunc(Class class, SEL sel, const char*
             PyObjCFFI_MakeIMPForSignature(methinfo, PyObjCSelector_GetSelector(sel), imp);
 
         if (retval == NULL && PyErr_ExceptionMatches(PyExc_NotImplementedError)) {
-            PyObject* exc = PyErr_Occurred();
+            PyObject* exc       = NULL;
+            PyObject* tp        = NULL;
+            PyObject* traceback = NULL;
+
+            PyErr_Fetch(&tp, &exc, &traceback);
+            PyErr_NormalizeException(&tp, &exc, &traceback);
+
             Py_INCREF(exc);
+            PyErr_Restore(tp, exc, traceback);
 
             PyErr_Format(PyExc_NotImplementedError, "Cannot generate IMP for %s",
                          sel_getName(aSelector));
-            PyException_SetCause(PyErr_Occurred(), exc);
+
+            PyObject* new_exc = NULL;
+
+            PyErr_Fetch(&tp, &new_exc, &traceback);
+            PyErr_NormalizeException(&tp, &new_exc, &traceback);
+            Py_INCREF(new_exc);
+            PyErr_Restore(tp, new_exc, traceback);
+            PyException_SetCause(new_exc, exc);
+            Py_DECREF(new_exc);
         }
 
         return retval;

diff --git a/pyobjc-framework-AVFoundation/Modules/pyobjc-compat.h b/pyobjc-framework-AVFoundation/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-AVKit/Modules/pyobjc-compat.h b/pyobjc-framework-AVKit/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-AVRouting/Modules/pyobjc-compat.h b/pyobjc-framework-AVRouting/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-Accessibility/Modules/pyobjc-compat.h b/pyobjc-framework-Accessibility/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-AddressBook/Modules/pyobjc-compat.h b/pyobjc-framework-AddressBook/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-ApplicationServices/Modules/pyobjc-compat.h b/pyobjc-framework-ApplicationServices/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-AuthenticationServices/Modules/pyobjc-compat.h b/pyobjc-framework-AuthenticationServices/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-AutomaticAssessmentConfiguration/Modules/pyobjc-compat.h b/pyobjc-framework-AutomaticAssessmentConfiguration/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-BackgroundAssets/Modules/pyobjc-compat.h b/pyobjc-framework-BackgroundAssets/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-CFNetwork/Modules/pyobjc-compat.h b/pyobjc-framework-CFNetwork/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-ClassKit/Modules/pyobjc-compat.h b/pyobjc-framework-ClassKit/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-Cocoa/Lib/AppKit/__init__.py b/pyobjc-framework-Cocoa/Lib/AppKit/__init__.py
@@ -58,6 +58,8 @@ def NSDictionaryOfVariableBindings(*names):
         "NSDictionaryOfVariableBindings": NSDictionaryOfVariableBindings,
         "__path__": __path__,
         "__loader__": globals().get("__loader__", None),
+        "__file__": globals().get("__file__", None),
+        "__spec__": globals().get("__spec__", None),
     },
     (Foundation,),
 )

diff --git a/pyobjc-framework-Cocoa/Lib/Cocoa/__init__.py b/pyobjc-framework-Cocoa/Lib/Cocoa/__init__.py
@@ -21,6 +21,8 @@
         "objc": objc,
         "__path__": __path__,
         "__loader__": globals().get("__loader__", None),
+        "__file__": globals().get("__file__", None),
+        "__spec__": globals().get("__spec__", None),
     },
     (AppKit, Foundation),
 )

diff --git a/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py b/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py
@@ -20,6 +20,8 @@
         "__doc__": __doc__,
         "__path__": __path__,
         "__loader__": globals().get("__loader__", None),
+        "__file__": globals().get("__file__", None),
+        "__spec__": globals().get("__spec__", None),
     },
     (),
 )
@@ -28,11 +30,15 @@
 import CoreFoundation._CoreFoundation  # isort:skip  # noqa: E402
 
 for nm in dir(CoreFoundation._CoreFoundation):
+    if nm.startswith("_"):
+        continue
     setattr(mod, nm, getattr(CoreFoundation._CoreFoundation, nm))
 
 import CoreFoundation._static  # isort:skip  # noqa: E402
 
 for nm in dir(CoreFoundation._static):
+    if nm.startswith("_"):
+        continue
     setattr(mod, nm, getattr(CoreFoundation._static, nm))
 
 

diff --git a/pyobjc-framework-Cocoa/Lib/Foundation/__init__.py b/pyobjc-framework-Cocoa/Lib/Foundation/__init__.py
@@ -178,6 +178,8 @@ def indexset_contains(self, value):
         "NO": objc.NO,
         "__path__": __path__,
         "__loader__": globals().get("__loader__", None),
+        "__file__": globals().get("__file__", None),
+        "__spec__": globals().get("__spec__", None),
     },
     (CoreFoundation,),
 )
@@ -200,6 +202,8 @@ def indexset_contains(self, value):
 import Foundation._nsobject  # isort:skip  # noqa: E402
 
 for nm in dir(Foundation._functiondefines):
+    if nm.startswith("_"):
+        continue
     setattr(mod, nm, getattr(Foundation._functiondefines, nm))
 
 
@@ -209,4 +213,6 @@ def indexset_contains(self, value):
 
 
 for nm in dir(Foundation._context):
+    if nm.startswith("_"):
+        continue
     setattr(mod, nm, getattr(Foundation._context, nm))
diff --git a/pyobjc-framework-Cocoa/Modules/pyobjc-compat.h b/pyobjc-framework-Cocoa/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-Contacts/Modules/pyobjc-compat.h b/pyobjc-framework-Contacts/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */
diff --git a/pyobjc-framework-ContactsUI/Modules/pyobjc-compat.h b/pyobjc-framework-ContactsUI/Modules/pyobjc-compat.h
@@ -309,6 +309,10 @@ NS_ASSUME_NONNULL_BEGIN
 #define MAC_OS_X_VERSION_13_4 130400
 #endif
 
+#ifndef MAC_OS_X_VERSION_13_5
+#define MAC_OS_X_VERSION_13_5 130500
+#endif
+
 /*
  *
  * End of Cocoa definitions
@@ -507,6 +511,8 @@ _PyObjCTuple_GetItem(PyObject* tuple, Py_ssize_t idx)
         PyGILState_Release(_GILState);                                                   \
     } while (0)
 
+extern PyObject* _Nullable PyObjC_get_tp_dict(PyTypeObject* _Nonnull tp);
+
 NS_ASSUME_NONNULL_END
 
 #endif /* PyObjC_COMPAT_H */