From 5cfe5d789796919d815c5707928bd5f4febad3bf Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 3 Dec 2019 17:51:37 +0100 Subject: [PATCH] utils/genrandconfig: fix runtime issue with Python 3 With Python 3.7, genrandconfig fails with: 'str' object has no attribute 'decode' We are already working on str objects, and there is no need to decode them, so we drop the call to decode_byte_list() and its definition as it was only used there. Signed-off-by: Thomas Petazzoni Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- utils/genrandconfig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index aaba6c4204..c221ebd670 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -39,14 +39,6 @@ def urlopen_closing(uri): return contextlib.closing(_urllib.urlopen(uri)) -if sys.hexversion >= 0x3000000: - def decode_byte_list(bl): - return [b.decode() for b in bl] -else: - def decode_byte_list(e): - return e - - class SystemInfo: DEFAULT_NEEDED_PROGS = ["make", "git", "gcc", "timeout"] DEFAULT_OPTIONAL_PROGS = ["bzr", "java", "javac", "jar", "diffoscope"] @@ -128,7 +120,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): with open(toolchains_csv) as r: # filter empty lines and comments lines = [t for t in r.readlines() if len(t.strip()) > 0 and t[0] != '#'] - toolchains = decode_byte_list(lines) + toolchains = lines configs = [] (_, _, _, _, hostarch) = os.uname() -- 2.30.2