Changeset 70568 in vbox

Timestamp:

Jan 12, 2018 9:44:37 PM (7 years ago)

Author:

vboxsync

Message:

common/utils.py: More python 3 fixes.

File:

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

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

@@ -381 +381 @@
     except:
         return sXcptRet;
-    return sRet.decode(sEncoding, 'ignore');
+    if hasattr(sRet, 'decode'):
+        sRet = sRet.decode(sEncoding, 'ignore');
+    return sRet;
 
 def readFile(sFile, sMode = 'rb'):
@@ -400 +402 @@
     except:
         sRet = sXcptRet;
-    if sEncoding is not None:
+    if sEncoding is not None and hasattr(sRet, 'decode'):
         sRet = sRet.decode(sEncoding, 'ignore');
     return sRet;
@@ -588 +590 @@
     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.
+
+    Extra keywords for specifying now output is to be decoded:
+        sEncoding='utf-8
+        fIgnoreEncoding=True/False
     """
     sEncoding = dKeywordArgs.get('sEncoding');
     if sEncoding is not None:   del dKeywordArgs['sEncoding'];
     else:                       sEncoding = 'utf-8';
+
+    fIgnoreEncoding = dKeywordArgs.get('fIgnoreEncoding');
+    if sEncoding is not None:   del dKeywordArgs['fIgnoreEncoding'];
+    else:                       fIgnoreEncoding = True;
 
     _processFixPythonInterpreter(aPositionalArgs, dKeywordArgs);
@@ -607 +616 @@
         raise subprocess.CalledProcessError(iExitCode, asArgs);
 
-    return sOutput.decode(sEncoding);
+    if hasattr(sOutput, 'decode'):
+        sOutput = sOutput.decode(sEncoding, 'ignore' if fIgnoreEncoding else 'strict');
+    return sOutput;
 
 g_fOldSudo = None;