Changeset 70566 in vbox for trunk/src/VBox/ValidationKit/testboxscript

Timestamp:

Jan 12, 2018 6:25:48 PM (7 years ago)

Author:

vboxsync

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

120253

Message:

testboxdriver,testboxscript: Python3 updates.

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• testboxconnection.py (modified) (3 diffs)
• testboxtasks.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxconnection.py

@@ -32 +32 @@
 # Standard python imports.
 import sys;
-import urllib
 if sys.version_info[0] >= 3:
-    import http.client as httplib;      # pylint: disable=import-error,no-name-in-module
-    import urllib.parse as urlparse;    # pylint: disable=import-error,no-name-in-module
+    import http.client as httplib;                          # pylint: disable=import-error,no-name-in-module
+    import urllib.parse as urlparse;                        # pylint: disable=import-error,no-name-in-module
+    from urllib.parse import urlencode as urllib_urlencode; # pylint: disable=import-error,no-name-in-module
 else:
-    import httplib;                     # pylint: disable=import-error
-    import urlparse;                    # pylint: disable=import-error
+    import httplib;                                         # pylint: disable=import-error
+    import urlparse;                                        # pylint: disable=import-error
+    from urllib import urlencode as urllib_urlencode;       # pylint: disable=import-error
 
 # Validation Kit imports.
@@ -59 +60 @@
             # Read the whole response (so we can log it).
             sBody = oResponse.read();
+            sBody = sBody.decode('utf-8');
 
             # Check the content type.
@@ -199 +201 @@
         sServerPath = '/%s/testboxdisp.py' % (self._oParsedUrl.path.strip('/'),); # pylint: disable=E1101
         dParams[constants.tbreq.ALL_PARAM_ACTION] = sAction;
-        sBody = urllib.urlencode(dParams);
+        sBody = urllib_urlencode(dParams);
         ##testboxcommons.log2('sServerPath=%s' % (sServerPath,));
         try:

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -642 +642 @@
             oFile = open(sPath, "rb");
             sStr = oFile.read();
+            sStr = sStr.decode('utf-8');
             oFile.close();
             return sStr.strip();
@@ -779 +780 @@
         try:
             oFile = open(sPath, "wb");
-            oFile.write(sContent);
+            oFile.write(sContent.encode('utf-8'));
             oFile.flush();
             try:     os.fsync(oFile.fileno());