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

Timestamp:

Jan 12, 2018 8:19:37 PM (7 years ago)

Author:

vboxsync

Message:

utils.py: Python 3 fixes.

File:

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

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

@@ -373 +373 @@
     return oFile;
 
-def noxcptReadLink(sPath, sXcptRet):
+def noxcptReadLink(sPath, sXcptRet, sEncoding = 'utf-8'):
     """
     No exceptions os.readlink wrapper.
@@ -380 +380 @@
         sRet = os.readlink(sPath); # pylint: disable=E1101
     except:
-        sRet = sXcptRet;
-    return sRet;
+        return sXcptRet;
+    return sRet.decode(sEncoding, 'ignore');
 
 def readFile(sFile, sMode = 'rb'):
@@ -392 +392 @@
     return sRet;
 
-def noxcptReadFile(sFile, sXcptRet, sMode = 'rb'):
+def noxcptReadFile(sFile, sXcptRet, sMode = 'rb', sEncoding = 'utf-8'):
     """
     No exceptions common.readFile wrapper.
@@ -400 +400 @@
     except:
         sRet = sXcptRet;
+    if sEncoding is not None:
+        sRet = sRet.decode(sEncoding, 'ignore');
     return sRet;