Convert this tool to requiring Python 3. The bulk of this is done with
the 2to3 tool In addition, we need to use the '//' operator to have our
division result return an int rather than a float and ensure that we use
UTF-8 when reading/writing files.
Cc: Masahiro Yamada
Signed-off-by: Tom Rini
---
Changes in v2:
- Add encoding="utf-8" in various places.
---
tools/genboardscfg.py | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py
index e9bbd15e15a9..e9a9c11865b9 100755
--- a/tools/genboardscfg.py
+++ b/tools/genboardscfg.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# SPDX-License-Identifier: GPL-2.0+
#
# Author: Masahiro Yamada
@@ -91,7 +91,7 @@ def output_is_new(output):
# Detect a board that has been removed since the current board database
# was generated
-with open(output) as f:
+with open(output, encoding="utf-8") as f:
for line in f:
if line[0] == '#' or line == '\n':
continue
@@ -168,7 +168,7 @@ class KconfigScanner:
warnings = self._conf.load_config(self._tmpfile)
if warnings:
for warning in warnings:
-print '%s: %s' % (defconfig, warning)
+print('%s: %s' % (defconfig, warning))
try_remove(self._tmpfile)
self._tmpfile = None
@@ -177,7 +177,7 @@ class KconfigScanner:
# Get the value of CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... etc.
# Set '-' if the value is empty.
-for key, symbol in self._SYMBOL_TABLE.items():
+for key, symbol in list(self._SYMBOL_TABLE.items()):
value = self._conf.get_symbol(symbol).get_value()
if value:
params[key] = value
@@ -242,8 +242,8 @@ def scan_defconfigs(jobs=1):
processes = []
queues = []
for i in range(jobs):
-defconfigs = all_defconfigs[total_boards * i / jobs :
-total_boards * (i + 1) / jobs]
+defconfigs = all_defconfigs[total_boards * i // jobs :
+total_boards * (i + 1) // jobs]
q = multiprocessing.Queue(maxsize=-1)
p = multiprocessing.Process(target=scan_defconfigs_for_multiprocess,
args=(q, defconfigs))
@@ -290,7 +290,7 @@ class MaintainersDatabase:
'Active', 'Orphan' or '-'.
"""
if not target in self.database:
-print >> sys.stderr, "WARNING: no status info for '%s'" % target
+print("WARNING: no status info for '%s'" % target, file=sys.stderr)
return '-'
tmp = self.database[target][0]
@@ -301,8 +301,8 @@ class MaintainersDatabase:
elif tmp.startswith('Orphan'):
return 'Orphan'
else:
-print >> sys.stderr, ("WARNING: %s: unknown status for '%s'" %
- (tmp, target))
+print(("WARNING: %s: unknown status for '%s'" %
+ (tmp, target)), file=sys.stderr)
return '-'
def get_maintainers(self, target):
@@ -313,7 +313,7 @@ class MaintainersDatabase:
they are separated with colons.
"""
if not target in self.database:
-print >> sys.stderr, "WARNING: no maintainers for '%s'" % target
+print("WARNING: no maintainers for '%s'" % target, file=sys.stderr)
return ''
return ':'.join(self.database[target][1])
@@ -330,7 +330,7 @@ class MaintainersDatabase:
targets = []
maintainers = []
status = '-'
-for line in open(file):
+for line in open(file, encoding="utf-8"):
# Check also commented maintainers
if line[:3] == '#M:':
line = line[1:]
@@ -404,7 +404,7 @@ def format_and_output(params_list, output):
# ignore case when sorting
output_lines.sort(key=str.lower)
-with open(output, 'w') as f:
+with open(output, 'w', encoding="utf-8") as f:
f.write(COMMENT_BLOCK + '\n'.join(output_lines) + '\n')
def gen_boards_cfg(output, jobs=1, force=False):
@@ -418,7 +418,7 @@ def gen_boards_cfg(output, jobs=1, force=False):
check_top_directory()
if not force and output_is_new(output):
-print "%s is up to date. Nothing to do." % output
+print("%s is up to date. Nothing to do." % output)
sys.exit(0)
params_list = scan_defconfigs(jobs)
--
2.7.4
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
