Changeset 59769 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Feb 22, 2016 12:14:21 PM (9 years ago)

Author:

vboxsync

Message:

PyXPCOM: port to make it compatible with Python 3 (minimum supported version is 2.6 like for all other Python files now)
Frontends/VBoxShell, Installer/common/vboxapisetup.py, Main/glue/vboxapi.py, Main/webservice/websrv-python.xsl: make it compatible with Python 3

File:

• trunk/src/VBox/Main/glue/vboxapi.py (modified) (3 diffs)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -7 +7 @@
 __copyright__ = \
     """
-    Copyright (C) 2009-2015 Oracle Corporation
+    Copyright (C) 2009-2016 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
     xrange = range
     long = int
-    import builtins
-    print_ = getattr(builtins, 'print', None)
-elif sys.version_info >= (2, 6):
-    import __builtin__
-    print_ = getattr(__builtin__, 'print', None)
-else:
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if isinstance(fp, file) and isinstance(data, unicode) and fp.encoding is not None:
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
 
 #
@@ -225 +167 @@
     # Try case-insensitivity workaround for class attributes (COM methods).
     sAttrLower = sAttr.lower()
-    for k in self.__class__.__dict__.keys():
+    for k in list(self.__class__.__dict__.keys()):
         if k.lower() == sAttrLower:
             setattr(self.__class__, sAttr, self.__class__.__dict__[k])