WIPpython3

Author: douglas-raillard-arm

devlib/utils/misc.py

@@ -186,11 +186,10 @@ def check_output(command, timeout=None, ignore=None, inputtext=None,
     else:
         timeout_expired = None
 
-    if sys.version_info[0] == 3:
-        # Currently errors=replace is needed as 0x8c throws an error
-        output = output.decode(sys.stdout.encoding or 'utf-8', "replace")
-        if error:
-            error = error.decode(sys.stderr.encoding or 'utf-8', "replace")
+    # Currently errors=replace is needed as 0x8c throws an error
+    output = output.decode(sys.stdout.encoding or 'utf-8', "replace")
+    if error:
+        error = error.decode(sys.stderr.encoding or 'utf-8', "replace")
 
     if timeout_expired:
         raise TimeoutError(command, output='\n'.join([output or '', error or '']))