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 <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit 5cfe5d7897
)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
22e4bfc763
commit
8dc2acff55
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue