Changeset 90595 in vbox

Timestamp:

Aug 10, 2021 12:49:53 PM (4 years ago)

Author:

vboxsync

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

146206

Message:

ValKit: More Python 3.9 API changes needed (array.array.tostring() -> .tobytes()) bugref:10079

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/reporter.py (modified) (2 diffs)
• testdriver/txsclient.py (modified) (2 diffs)
• testmanager/batch/virtual_test_sheriff.py (modified) (2 diffs)
• tests/storage/remoteexecutor.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/reporter.py

@@ -1223 +1223 @@
             if isinstance(sText, array.array):
                 try:
-                    sText = sText.tostring();
+                    if sys.version_info < (3, 9, 0):
+                        # Removed since Python 3.9.
+                        sText.tostring(); # pylint: disable=no-member
+                    else:
+                        sText.tobytes();
                 except:
                     pass;
@@ -1283 +1287 @@
         if not utils.isString(sText):
             if isinstance(sText, array.array):
-                try:    sText = sText.tostring();
-                except: pass;
+                try:
+                    if sys.version_info < (3, 9, 0):
+                        # Removed since Python 3.9.
+                        sText = sText.tostring(); # pylint: disable=no-member
+                    else:
+                        sText = sText.tobytes();
+                except:
+                    pass;
             if hasattr(sText, 'decode'):
                 try:    sText = sText.decode('utf-8', 'ignore');

trunk/src/VBox/ValidationKit/testdriver/txsclient.py

@@ -307 +307 @@
         cbMsg   = getU32(abHdr, 0);
         uCrc32  = getU32(abHdr, 4);
-        sOpcode = abHdr[8:16].tostring().decode('ascii');
+
+        if sys.version_info < (3, 9, 0):
+            # Removed since Python 3.9.
+            sOpcode = abHdr[8:16].tostring(); # pylint: disable=no-member
+        else:
+            sOpcode = abHdr[8:16].tobytes();
+        sOpcode = sOpcode.decode('ascii');
 
         if cbMsg < 16:
@@ -1270 +1276 @@
                 # Finally, push the data to the file.
                 try:
-                    oLocalFile.write(abPayload[4:].tostring());
+                    if sys.version_info < (3, 9, 0):
+                        # Removed since Python 3.9.
+                        abData = abPayload[4:].tostring();
+                    else:
+                        abData = abPayload[4:].tobytes();
+                    oLocalFile.write(abData);
                 except:
                     reporter.errorXcpt('I/O error writing to "%s"' % (sRemoteFile));

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -272 +272 @@
                 try:
                     oHash = hashlib.sha256();
-                    oHash.update(oImage.tostring());
+                    if sys.version_info < (3, 9, 0):
+                        # Removed since Python 3.9.
+                        oHash.update(oImage.tostring()); # pylint: disable=no-member
+                    else:
+                        oHash.update(oImage.tobytes());
                 except Exception as oXcpt:
                     self.oSheriff.vprint(u'Error hashing the uncompressed image bytes for "%s": %s' % (oFile.sFile, oXcpt,))
@@ -1753 +1757 @@
 if __name__ == '__main__':
     sys.exit(VirtualTestSheriff().main());
-

trunk/src/VBox/ValidationKit/tests/storage/remoteexecutor.py

@@ -64 +64 @@
         if isinstance(sText, array.array):
             try:
-                return str(sText.tostring()); # tostring() returns bytes with python3.
+                if sys.version_info < (3, 9, 0):
+                    # Removed since Python 3.9.
+                    return str(sText.tostring()); # pylint: disable=no-member
+                else:
+                    return str(sText.tobytes());
             except:
                 pass;
@@ -301 +305 @@
 
         return fRc;
-