Changeset 59824 in vbox for trunk

Timestamp:

Feb 25, 2016 7:12:28 PM (9 years ago)

Author:

vboxsync

Message:

python/server/policy.py: fix syntax incompatibility between python3 and python2

File:

• trunk/src/libs/xpcom18a4/python/server/policy.py (modified) (2 diffs)

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

@@ -294 +294 @@
             if logger.isEnabledFor(logging.DEBUG):
                 try:
-                    raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
+                    if sys.version_info[0] <= 2:
+                        exec('raise exc_info[0], exc_info[1], exc_info[2]')
+                    else:
+                        raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
                 except:
                     logger.debug("'%s' raised COM Exception %s",
@@ -302 +305 @@
         # As above, trick the logging module to handle Python 2.3
         try:
-            raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
+            if sys.version_info[0] <= 2:
+                exec('raise exc_info[0], exc_info[1], exc_info[2]')
+            else:
+                raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
         except:
             logger.exception("Unhandled exception calling '%s'", func_name)