Changeset 50710 in vbox

Timestamp:

Mar 6, 2014 1:08:28 PM (11 years ago)

Author:

vboxsync

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

92674

Message:

pyxpcom: Support new style python classes (derived from object), upstream changeset b6fce9508c70 (​http://hg.mozilla.org/pyxpcom/rev/b6fce9508c70).

Location:

trunk/src/libs/xpcom18a4/python

Files:

• server/loader.py (modified) (1 diff)
• src/PyGBase.cpp (modified) (1 diff)
• src/PyIID.cpp (modified) (1 diff)
• src/PyISupports.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/server/loader.py

@@ -58 +58 @@
     comps = []
     for name, object in py_module.__dict__.items():
-        if type(object)==types.ClassType and \
-           _has_good_attr(object, "_com_interfaces_") and \
-           _has_good_attr(object, "_reg_clsid_") and \
-           _has_good_attr(object, "_reg_contractid_"):
-            comps.append(object)
+        try:
+            if (type(object) == types.ClassType or issubclass(object, object)) and \
+               _has_good_attr(object, "_com_interfaces_") and \
+               _has_good_attr(object, "_reg_clsid_") and \
+               _has_good_attr(object, "_reg_contractid_"):
+                comps.append(object)
+        except TypeError:
+            # The issubclass call raises TypeError when the obj is not a class.
+            pass;
     return comps
 

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

@@ -196 +196 @@
 {
         NS_PRECONDITION(ppret!=NULL, "null pointer when wrapping a Python instance!");
-        NS_PRECONDITION(ob && PyInstance_Check(ob), "AutoWrapPythonInstance is expecting an non-NULL instance!");
+        NS_PRECONDITION(ob && PyObject_HasAttrString(ob, "__class__"),
+                        "AutoWrapPythonInstance is expecting an non-NULL instance!");
         PRBool ok = PR_FALSE;
     // XXX - todo - this static object leaks! (but Python on Windows leaks 2000+ objects as it is ;-)

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

@@ -115 +115 @@
         } else if (ob->ob_type == &type) {
                 iid = ((Py_nsIID *)ob)->m_iid;
-        } else if (PyInstance_Check(ob)) {
+        } else if (PyObject_HasAttrString(ob, "__class__")) {
                 // Get the _iidobj_ attribute
                 PyObject *use_ob = PyObject_GetAttrString(ob, "_iidobj_");

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

@@ -322 +322 @@
         if (iid.Equals(NS_GET_IID(nsIVariant)) || iid.Equals(NS_GET_IID(nsIWritableVariant))) {
                 // Check it is not already nsIVariant
-                if (PyInstance_Check(ob)) {
+                if (PyObject_HasAttrString(ob, "__class__")) {
                         PyObject *sub_ob = PyObject_GetAttrString(ob, "_comobj_");
                         if (sub_ob==NULL) {
@@ -345 +345 @@
         // end of variant support.
 
-        if (PyInstance_Check(ob)) {
+        if (PyObject_HasAttrString(ob, "__class__")) {
                 // Get the _comobj_ attribute
                 PyObject *use_ob = PyObject_GetAttrString(ob, "_comobj_");