Changeset 70566 in vbox for trunk/src/VBox/ValidationKit/common/utils.py

Timestamp:

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

Author:

vboxsync

Message:

testboxdriver,testboxscript: Python3 updates.

File:

• trunk/src/VBox/ValidationKit/common/utils.py (modified) (4 diffs)

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

@@ -104 +104 @@
             else:
                 try:
-                    sArch = processOutputChecked(['/usr/bin/isainfo', '-n',]);
+                    sArch = str(processOutputChecked(['/usr/bin/isainfo', '-n',]));
                 except:
                     pass;
@@ -586 +586 @@
     Wrapper around subprocess.check_output to deal with its absense in older
     python versions.
-    """
+    Extra keyword: sEncoding='utf-8; for specifying now output is to be decoded.
+    """
+    sEncoding = dKeywordArgs.get('sEncoding');
+    if sEncoding is not None:   del dKeywordArgs['sEncoding'];
+    else:                       sEncoding = 'utf-8';
+
     _processFixPythonInterpreter(aPositionalArgs, dKeywordArgs);
     oProcess = processPopenSafe(stdout=subprocess.PIPE, *aPositionalArgs, **dKeywordArgs);
@@ -600 +605 @@
         raise subprocess.CalledProcessError(iExitCode, asArgs);
 
-    return str(sOutput); # str() make pylint happy.
+    return sOutput.decode(sEncoding);
 
 g_fOldSudo = None;
@@ -625 +630 @@
         if g_fOldSudo is None:
             try:
-                sVersion = processOutputChecked(['sudo', '-V']);
+                sVersion = str(processOutputChecked(['sudo', '-V']));
             except:
                 sVersion = '1.7.0';