From 2ec3c146072aab8d815be28e204cd29c2f19cb64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 12 May 2019 12:23:30 +0200 Subject: [PATCH] Stop setting utf-8 in decode/encode calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It's the default value. Change-Id: I301f750cabc41a1564a700ae8d7328f195a4ae9b Signed-off-by: Cédric Ollivier (cherry picked from commit 0d308f4db3434ae6f8147f0f452e5c542429e636) --- xtesting/core/feature.py | 4 ++-- xtesting/core/unit.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xtesting/core/feature.py b/xtesting/core/feature.py index f28e720c..6d5d7410 100644 --- a/xtesting/core/feature.py +++ b/xtesting/core/feature.py @@ -113,8 +113,8 @@ class BashFeature(Feature): stderr=subprocess.STDOUT) for line in iter(process.stdout.readline, b''): if console: - sys.stdout.write(line.decode("utf-8")) - f_stdout.write(line.decode("utf-8")) + sys.stdout.write(line.decode()) + f_stdout.write(line.decode()) process.wait() with open(self.result_file, 'r') as f_stdin: self.__logger.debug("$ %s\n%s", cmd, f_stdin.read().rstrip()) diff --git a/xtesting/core/unit.py b/xtesting/core/unit.py index 774411a4..8e603ce6 100644 --- a/xtesting/core/unit.py +++ b/xtesting/core/unit.py @@ -48,7 +48,7 @@ class Suite(testcase.TestCase): stats = subprocess.Popen( ['subunit-stats'], stdin=subprocess.PIPE, stdout=subprocess.PIPE) output, _ = stats.communicate(stream.read()) - cls.__logger.info("\n\n%s", output.decode("utf-8")) + cls.__logger.info("\n\n%s", output.decode()) def generate_xunit(self, stream): """Generate junit report from subunit stream @@ -62,7 +62,7 @@ class Suite(testcase.TestCase): ['subunit2junitxml'], stdin=subprocess.PIPE, stdout=subprocess.PIPE) output, _ = stats.communicate(stream.read()) - xml.write(output.decode("utf-8")) + xml.write(output.decode()) def generate_html(self, stream): """Generate html report from subunit stream -- 2.16.6