From df61b2a269880882abb41346f10456263be1532f Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 18 Jul 2018 16:49:36 +0100 Subject: [PATCH] utils/misc: check_output: handle unset sys encoding Default to assuming 'utf-8' encoding for environments where sys.stdout.encoding is not set. --- devlib/utils/misc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devlib/utils/misc.py b/devlib/utils/misc.py index a8f8007..45d19d2 100644 --- a/devlib/utils/misc.py +++ b/devlib/utils/misc.py @@ -183,9 +183,9 @@ def check_output(command, timeout=None, ignore=None, inputtext=None, output, error = process.communicate(inputtext) if sys.version_info[0] == 3: # Currently errors=replace is needed as 0x8c throws an error - output = output.decode(sys.stdout.encoding, "replace") + output = output.decode(sys.stdout.encoding or 'utf-8', "replace") if error: - error = error.decode(sys.stderr.encoding, "replace") + error = error.decode(sys.stderr.encoding or 'utf-8', "replace") finally: if timeout: timer.cancel()