* [Buildroot] [git commit branch/2019.11.x] utils/genrandconfig: fix runtime issue with Python 3
@ 2019-12-06 8:59 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2019-12-06 8:59 UTC (permalink / raw
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=8dc2acff55decb63db56a300d8eb00cfebcba3ec
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2019.11.x
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 5cfe5d789796919d815c5707928bd5f4febad3bf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
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()
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-12-06 8:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-06 8:59 [Buildroot] [git commit branch/2019.11.x] utils/genrandconfig: fix runtime issue with Python 3 Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.