support/scripts/pkg-stats: decode subprocess output for python3
PATCH 1/1 support/scripts/pkg-stats: decode subprocess output for python3
In Python 3, the functions from the subprocess module return bytes (and no longer strings as in Python 2), which must be decoded for further text operations.
Now, pkg-stats can be run in Python 3.
Signed-off-by Titouan Christophe <[email protected]>
--- support/scripts/pkg-stats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
support/scripts/pkg-stats +3 -3
@@ -157,7 +157,7 @@ class Package: o = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1] lines = o.splitlines() for line in lines: - m = re.match("^([0-9]*) warnings generated", line) + m = re.match("^([0-9]*) warnings generated", line.decode()) if m: self.warnings = int(m.group(1)) return
@@ -351,7 +351,7 @@ def package_init_make_info(): # Fetch all variables at once variables = subprocess.check_output(["make", "BR2_HAVE_DOT_CONFIG=y", "-s", "printvars", "VARS=%_LICENSE %_LICENSE_FILES %_VERSION %_IGNORE_CVES"]) - variable_list = variables.splitlines() + variable_list = variables.decode().splitlines() # We process first the host package VERSION, and then the target # package VERSION. This means that if a package exists in both
@@ -886,7 +886,7 @@ def __main__(): package_list = None date = datetime.datetime.utcnow() commit = subprocess.check_output(['git', 'rev-parse', - 'HEAD']).splitlines()[0] + 'HEAD']).splitlines()[0].decode() print("Build package list ...") packages = get_pkglist(args.npackages, package_list) print("Getting package make info ...")
Signature · 1 line
2.24.1
PATCH 1/1 support/scripts/pkg-stats: decode subprocess output for python3
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Titouan" == Titouan Christophe <[email protected]> writes:
In Python 3, the functions from the subprocess module return bytes (and no longer strings as in Python 2), which must be decoded for further text operations.
Now, pkg-stats can be run in Python 3.
Signed-off-by Titouan Christophe <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard