Changeset 65828 in vbox for trunk/src/VBox

Timestamp:

Feb 21, 2017 9:55:39 AM (8 years ago)

Author:

vboxsync

Message:

python 3 fixes.

Location:

trunk/src/VBox

Files:

• VMM/VMMAll/IEMAllInstructionsPython.py (modified) (3 diffs)
• ValidationKit/common/webutils.py (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsPython.py

@@ -199 +199 @@
 
         # Invert and convert to bytearray and return it.
-        abValue = bytearray([int(sHex[offHex - 2 : offHex], 16) for offHex in xrange(len(sHex), 0, -2)]);
+        abValue = bytearray([int(sHex[offHex - 2 : offHex], 16) for offHex in range(len(sHex), 0, -2)]);
 
         return (fSignExtend, abValue);
@@ -704 +704 @@
         """
         if self.fDebug:
-            print 'debug: %s' % (sMessage,);
+            print('debug: %s' % (sMessage,));
+
 
     def addInstruction(self, iLine = None):
@@ -1903 +1904 @@
         cErrors = SimpleParser(sSrcFile, asLines, sDefaultMap).parse();
     except ParserException as oXcpt:
-        print str(oXcpt);
+        print(str(oXcpt));
         raise;
     except Exception as oXcpt:

trunk/src/VBox/ValidationKit/common/webutils.py

@@ -168 +168 @@
             oDst.close();
             oSrc.close();
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             fnError('Error downloading "%s" to "%s": %s' % (sUrlFile, sDstFile, oXcpt));
             return False;
@@ -177 +177 @@
         try:
             utils.copyFileSimple(sSrcPath, sDstFile);
-        except Exception, oXcpt:
+        except Exception as oXcpt:
             fnError('Error copying "%s" to "%s": %s' % (sSrcPath, sDstFile, oXcpt));
             return False;