Changeset 90630 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Aug 11, 2021 2:40:33 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146242

Message:

xpcom/python: It's either PyObject_Init or _Py_NewReference, we should skip the latter even for older releases. bugref:10079

Location:

trunk/src/libs/xpcom18a4/python/src

Files:

• PyIID.cpp (modified) (1 diff)
• PyISupports.cpp (modified) (1 diff)
• TypeObject.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/python/src/PyIID.cpp

@@ -266 +266 @@
         ob_type = GetTypeObject();
 #endif
-#if defined(Py_TRACE_REFS) || PY_VERSION_HEX < 0x03090000 /* VBox: Removed in 3.9, harmless. @bugref{10079} */
+#if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up, includes _Py_NewReferences. @bugref{10079} */ /** @todo do this for older pythons too?  We probably really should for Py_LIMITED_API builds... */
+        PyObject_Init(this, ob_type);
+#else
         _Py_NewReference(this);
-#endif
-#if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up. @bugref{10079} */
-    PyObject_Init(this, ob_type);
 #endif
 

trunk/src/libs/xpcom18a4/python/src/PyISupports.cpp

@@ -146 +146 @@
         PR_AtomicIncrement(&cInterfaces);
         PyXPCOM_DLLAddRef();
-#if defined(Py_TRACE_REFS) || PY_VERSION_HEX < 0x03090000 /* VBox: Removed in 3.9, harmless. @bugref{10079} */
+#if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up, includes _Py_NewReferences. @bugref{10079} */ /** @todo do this for older pythons too?  We probably really should for Py_LIMITED_API builds... */
+        PyObject_Init(this, ob_type);
+#else
         _Py_NewReference(this);
-#endif
-#if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up. @bugref{10079} */
-    PyObject_Init(this, ob_type);
 #endif
 

trunk/src/libs/xpcom18a4/python/src/TypeObject.cpp

@@ -435 +435 @@
         /* Initialize the PyObject part - needed so we can keep instance in a PyDict: */
         ob_type = PyXPCOM_GetInterfaceType();
-# if defined(Py_TRACE_REFS) || PY_VERSION_HEX < 0x03090000 /* VBox: Removed in 3.9, harmless. @bugref{10079} */
+# if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up, includes _Py_NewReferences. @bugref{10079} */ /** @todo do this for older pythons too?  We probably really should for Py_LIMITED_API builds... */
+        PyObject_Init(this, ob_type);
+# else
         _Py_NewReference(this);
-# endif
-# if PY_VERSION_HEX >= 0x03090000 /* VBox: Needed for 3.9 and up. @bugref{10079} */
-    PyObject_Init(this, ob_type);
 # endif