Changeset 59795 in vbox for trunk/src/libs/xpcom18a4/python/server/loader.py

Timestamp:

Feb 24, 2016 9:13:27 AM (9 years ago)

Author:

vboxsync

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

105674

Message:

temporarily back out the recent Python 3 changes (r105649, r105645, r105644, r105643, r105641)

File:

• trunk/src/libs/xpcom18a4/python/server/loader.py (modified) (5 diffs)

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

@@ -38 +38 @@
 import xpcom
 from xpcom import components, logger
-from . import module
-import glob
-import os
+
+import module
+
+import glob, os, types
+
 from xpcom.client import Component
 
@@ -55 +57 @@
     # For now, just run over all classes looking for likely candidates.
     comps = []
-    for name, object in list(py_module.__dict__.items()):
+    for name, object in py_module.__dict__.items():
         try:
-            if (type(object) == type or issubclass(object, object)) and \
+            if (type(object) == types.ClassType or issubclass(object, object)) and \
                _has_good_attr(object, "_com_interfaces_") and \
                _has_good_attr(object, "_reg_clsid_") and \
@@ -146 +148 @@
                     self.autoRegisterComponent(when, entry)
                 # Handle some common user errors
-                except xpcom.COMException as details:
+                except xpcom.COMException, details:
                     from xpcom import nsError
                     # If the interface name does not exist, suppress the traceback
@@ -154 +156 @@
                     else:
                         logger.exception("Registration of '%s' failed!", entry.leafName)
-                except SyntaxError as details:
+                except SyntaxError, details:
                     # Syntax error in source file - no useful traceback here either.
                     logger.error("Registration of '%s' failed\n %s",
@@ -224 +226 @@
 
 def MakePythonComponentLoaderModule(serviceManager, nsIFile):
-    from . import module
+    import module
     return module.Module( [PythonComponentLoader] )