stdeout and stderr content returned by subprocess API has different types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8' makes it unicode on both pythons.
Signed-off-by: Ed Bartosh <[email protected]> --- scripts/cleanup-workdir | 2 +- scripts/combo-layer | 2 +- scripts/lib/bsp/kernel.py | 10 +++++----- scripts/oe-selftest | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/cleanup-workdir b/scripts/cleanup-workdir index fee464c..0b2cf99 100755 --- a/scripts/cleanup-workdir +++ b/scripts/cleanup-workdir @@ -45,7 +45,7 @@ def run_command(cmd): if pipe.returncode != 0: print("Execute command '%s' failed." % cmd) sys.exit(1) - return output + return output.decode('utf-8') def get_cur_arch_dirs(workdir, arch_dirs): pattern = workdir + '/(.*?)/' diff --git a/scripts/combo-layer b/scripts/combo-layer index 0954bb6..7f0fa48 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -198,7 +198,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): raise e err.seek(0) - output = err.read() + output = err.read().decode('utf-8') logger.debug("output: %s" % output.replace(chr(0), '\\0')) return output diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index fe7133d..91cc79c 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py @@ -49,7 +49,7 @@ def find_bblayers(): bitbake_env_cmd = "bitbake -e" bitbake_env_lines = subprocess.Popen(bitbake_env_cmd, shell=True, - stdout=subprocess.PIPE).stdout.read() + stdout=subprocess.PIPE).stdout.read().decode('utf-8') if not bitbake_env_lines: print("Couldn't get '%s' output, exiting." % bitbake_env_cmd) @@ -734,7 +734,7 @@ def yocto_kernel_available_features_list(scripts_path, machine): feature_url = find_feature_url(giturl) feature_cmd = "wget -q -O - " + feature_url - tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(feature_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') print("The current set of kernel features available to %s is:\n" % machine) @@ -785,7 +785,7 @@ def get_feature_desc(git_url, feature): """ feature_desc_url = find_feature_desc_url(git_url, feature) feature_desc_cmd = "wget -q -O - " + feature_desc_url - tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(feature_desc_cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') return find_feature_desc(tmp.split("\n")) @@ -1001,7 +1001,7 @@ def base_branches(context): print("Getting branches from remote repo %s..." % giturl) gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) - tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') branches = [] @@ -1031,7 +1031,7 @@ def all_branches(context): print("Getting branches from remote repo %s..." % giturl) gitcmd = "git ls-remote %s *heads* 2>&1" % (giturl) - tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read() + tmp = subprocess.Popen(gitcmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') branches = [] diff --git a/scripts/oe-selftest b/scripts/oe-selftest index b1ecf7f..df76f94 100755 --- a/scripts/oe-selftest +++ b/scripts/oe-selftest @@ -371,7 +371,7 @@ def coverage_setup(coverage_source, coverage_include, coverage_omit): import subprocess builddir = os.environ.get("BUILDDIR") pokydir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) - curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"]) + curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"]).decode('utf-8') coveragerc = "%s/.coveragerc" % builddir data_file = "%s/.coverage." % builddir data_file += datetime.datetime.now().strftime('%Y%m%dT%H%M%S') -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
