From: Petr Štetiar <ynezz@true.cz>
Date: Tue, 19 Mar 2019 10:31:22 +0000 (+0000)
Subject: tools/b43-tools/b43-fwsquash: convert to Python 3 with 2-to-3
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5989a75cc455e09b79fe6880ba6bae6f6332cd24;p=openwrt%2Fstaging%2Fblogic.git

tools/b43-tools/b43-fwsquash: convert to Python 3 with 2-to-3

Let's convert the script to Python 3.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/tools/b43-tools/files/b43-fwsquash.py b/tools/b43-tools/files/b43-fwsquash.py
index 2946d7c3c324..6b4952cbc1dc 100755
--- a/tools/b43-tools/files/b43-fwsquash.py
+++ b/tools/b43-tools/files/b43-fwsquash.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # b43 firmware file squasher
 # Removes unnecessary firmware files
@@ -37,7 +37,7 @@ fwpath = sys.argv[3]
 
 phytypes = phytypes.split(',')
 try:
-	corerevs = map(lambda r: int(r), corerevs.split(','))
+	corerevs = [int(r) for r in corerevs.split(',')]
 except ValueError:
 	print("ERROR: \"%s\" is not a valid COREREVS string\n" % corerevs)
 	usage()
@@ -45,7 +45,7 @@ except ValueError:
 
 
 fwfiles = os.listdir(fwpath)
-fwfiles = filter(lambda str: str.endswith(".fw"), fwfiles)
+fwfiles = [str for str in fwfiles if str.endswith(".fw")]
 if not fwfiles:
 	print("ERROR: No firmware files found in %s" % fwpath)
 	sys.exit(1)