Changeset 70573 in vbox for trunk

Timestamp:

Jan 13, 2018 4:18:15 AM (7 years ago)

Author:

vboxsync

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

120260

Message:

testdriver/reporter.py: Python 3 adjustments.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• reporter.py (modified) (1 diff)
• vbox.py (modified) (1 diff)

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

@@ -746 +746 @@
 
         # Make sure it's a string which encoding we grok.
-        if sys.version_info[0] >= 3 and hasattr(sRspBody, 'decode'):
+        if hasattr(sRspBody, 'decode'):
             sRspBody = sRspBody.decode('utf-8', 'ignore');
 

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

@@ -1087 +1087 @@
                     sResponse = None;
                 os.close(iPipeR);
+
+                if hasattr(sResponse, 'decode'):
+                    sResponse = sResponse.decode('utf-8', 'ignore');
 
                 if sResponse is None  or  sResponse.strip() != 'READY':