Changeset 50710 in vbox for trunk/src/libs/xpcom18a4/python/server

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).

File:

• trunk/src/libs/xpcom18a4/python/server/loader.py (modified) (1 diff)

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