From 23137a9897ab2a946d5ac78963616d63f539f43f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Mar 2017 11:03:56 +0000 Subject: oeqs/sdk*/case: Use universal_newlines for subprocess calls This removes the need for some of the ugly decode calls with hardcoded locales. (From OE-Core rev: a14dddc77e553d2fa90d12576503dd3fc2e52bbc) Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/case.py | 2 +- meta/lib/oeqa/sdkext/case.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/lib/oeqa/sdk/case.py b/meta/lib/oeqa/sdk/case.py index 782db8b523..963aa8d358 100644 --- a/meta/lib/oeqa/sdk/case.py +++ b/meta/lib/oeqa/sdk/case.py @@ -9,4 +9,4 @@ class OESDKTestCase(OETestCase): def _run(self, cmd): return subprocess.check_output(". %s > /dev/null; %s;" % \ (self.tc.sdk_env, cmd), shell=True, - stderr=subprocess.STDOUT).decode("utf-8") + stderr=subprocess.STDOUT, universal_newlines=True) diff --git a/meta/lib/oeqa/sdkext/case.py b/meta/lib/oeqa/sdkext/case.py index 6f708aa4ca..21b718831c 100644 --- a/meta/lib/oeqa/sdkext/case.py +++ b/meta/lib/oeqa/sdkext/case.py @@ -18,4 +18,4 @@ class OESDKExtTestCase(OESDKTestCase): return subprocess.check_output(". %s > /dev/null;"\ " %s;" % (self.tc.sdk_env, cmd), stderr=subprocess.STDOUT, - shell=True, env=env).decode("utf-8") + shell=True, env=env, universal_newlines=True) -- cgit v1.2.3-54-g00ecf