aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 11:03:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:11 +0000
commit23137a9897ab2a946d5ac78963616d63f539f43f (patch)
tree975a7479851fbc3c397988f7d863ce1b6105ec5d
parent78195a23b09c1d5cee8e42d86463c9ee64b95e35 (diff)
downloadopenembedded-core-contrib-23137a9897ab2a946d5ac78963616d63f539f43f.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdk/case.py2
-rw-r--r--meta/lib/oeqa/sdkext/case.py2
2 files changed, 2 insertions, 2 deletions
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)