Changeset 70521 in vbox for trunk/src/VBox/ValidationKit/tests/usb

Timestamp:

Jan 10, 2018 3:49:10 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: More python 3 adjustments.

Location:

trunk/src/VBox/ValidationKit/tests/usb

Files:

• tdUsb1.py (modified) (1 diff)
• tst-utsgadget.py (modified) (2 diffs)
• usbgadget.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py

@@ -50 +50 @@
 # USB gadget control import
 import usbgadget;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
+
 
 class tdUsbBenchmark(vbox.TestDriver):                                      # pylint: disable=R0902

trunk/src/VBox/ValidationKit/tests/usb/tst-utsgadget.py

@@ -40 +40 @@
 import testdriver.reporter as reporter
 
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
+
+
 g_cTests = 0;
 g_cFailures = 0
@@ -57 +62 @@
     global g_cTests, g_cFailures;
     g_cTests = g_cTests + 1;
-    if isinstance(rc, basestring):
+    if utils.isString(rc):
         if rc == sExpect:
             return 'PASSED';

trunk/src/VBox/ValidationKit/tests/usb/usbgadget.py

@@ -169 +169 @@
     """Encodes the u32 value as a little endian byte (B) array."""
     return array.array('B', \
-                       (  u32             % 256, \
-                         (u32 / 256)      % 256, \
-                         (u32 / 65536)    % 256, \
-                         (u32 / 16777216) % 256) );
+                       (  u32              % 256, \
+                         (u32 // 256)      % 256, \
+                         (u32 // 65536)    % 256, \
+                         (u32 // 16777216) % 256) );
 
 def u16ToByteArray(u16):
     """Encodes the u16 value as a little endian byte (B) array."""
     return array.array('B', \
-                       (  u16        % 256, \
-                         (u16 / 256) % 256) );
+                       (  u16         % 256, \
+                         (u16 // 256) % 256) );
 
 def u8ToByteArray(uint8):
@@ -444 +444 @@
         for o in aoPayload:
             try:
-                if isinstance(o, basestring):
+                if utils.isString(o):
                     # the primitive approach...
                     sUtf8 = o.encode('utf_8');