Changeset 90631 in vbox for trunk/src/libs

Timestamp:

Aug 11, 2021 4:19:05 PM (4 years ago)

Author:

vboxsync

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

146243

Message:

libs/XPCOM: Just use PyObject_Init() everywhere (also for Python < 3.9) instead of _Py_NewReference(). 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 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
+        PyObject_Init(this, ob_type); /* VBox: Needed for 3.9 and up (also works on Python 2.7), includes _Py_NewReferences. @bugref{10079} */
 
         m_iid = riid;

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

@@ -146 +146 @@
         PR_AtomicIncrement(&cInterfaces);
         PyXPCOM_DLLAddRef();
-#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
+        PyObject_Init(this, ob_type); /* VBox: Needed for 3.9 and up (also works on Python 2.7), includes _Py_NewReferences. @bugref{10079} */
 
 #ifdef VBOX_DEBUG_LIFETIMES

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 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
+        PyObject_Init(this, ob_type); /* VBox: Needed for 3.9 and up (also works on Python 2.7), includes _Py_NewReferences. @bugref{10079} */
 
 #endif /* Py_LIMITED_API */