summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <valentinrothberg@gmail.com>2016-08-28 08:51:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-28 11:08:34 +0200
commit7c5227af25a1bee7c577162bd55600dae8023f5a (patch)
treeaeab3ea04039b6bf87abe9afcba9631aaeac413e
parentf175ba174ef3cb8c26e828c710e4e3b0f2bbbf55 (diff)
checkkconfigsymbols.py: port to Python 3
Python 2 is slowly dying, so port the script to Python 3. Signed-off-by: Valentin Rothberg <valentinrothberg@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rwxr-xr-xscripts/checkkconfigsymbols.py33
1 files changed, 17 insertions, 16 deletions
diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py
index 0cae73b5c925..2b13d8a5c0f6 100755
--- a/scripts/checkkconfigsymbols.py
+++ b/scripts/checkkconfigsymbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
"""Find Kconfig symbols that are referenced but not defined."""
@@ -128,9 +128,9 @@ def main():
if opts.sim and not opts.commit and not opts.diff:
sims = find_sims(opts.sim, opts.ignore)
if sims:
- print "%s: %s" % (yel("Similar symbols"), ', '.join(sims))
+ print("%s: %s" % (yel("Similar symbols"), ', '.join(sims)))
else:
- print "%s: no similar symbols found" % yel("Similar symbols")
+ print("%s: no similar symbols found" % yel("Similar symbols"))
sys.exit(0)
# dictionary of (un)defined symbols
@@ -183,28 +183,28 @@ def main():
# now print the output
for feature in sorted(undefined):
- print red(feature)
+ print(red(feature))
files = sorted(undefined.get(feature))
- print "%s: %s" % (yel("Referencing files"), ", ".join(files))
+ print("%s: %s" % (yel("Referencing files"), ", ".join(files)))
sims = find_sims(feature, opts.ignore, defined)
sims_out = yel("Similar symbols")
if sims:
- print "%s: %s" % (sims_out, ', '.join(sims))
+ print("%s: %s" % (sims_out, ', '.join(sims)))
else:
- print "%s: %s" % (sims_out, "no similar symbols found")
+ print("%s: %s" % (sims_out, "no similar symbols found"))
if opts.find:
- print "%s:" % yel("Commits changing symbol")
+ print("%s:" % yel("Commits changing symbol"))
commits = find_commits(feature, opts.diff)
if commits:
for commit in commits:
commit = commit.split(" ", 1)
- print "\t- %s (\"%s\")" % (yel(commit[0]), commit[1])
+ print("\t- %s (\"%s\")" % (yel(commit[0]), commit[1]))
else:
- print "\t- no commit found"
- print # new line
+ print("\t- no commit found")
+ print() # new line
def yel(string):
@@ -225,7 +225,8 @@ def execute(cmd):
"""Execute %cmd and return stdout. Exit in case of error."""
try:
cmdlist = cmd.split(" ")
- stdout = subprocess.check_output(cmdlist, stderr=STDOUT, shell=False)
+ stdout = subprocess.check_output(cmdlist, stderr=subprocess.STDOUT, shell=False)
+ stdout = stdout.decode(errors='replace')
except subprocess.CalledProcessError as fail:
exit("Failed to execute %s\n%s" % (cmd, fail))
return stdout
@@ -256,7 +257,7 @@ def get_head():
def partition(lst, size):
"""Partition list @lst into eveni-sized lists of size @size."""
- return [lst[i::size] for i in xrange(size)]
+ return [lst[i::size] for i in range(size)]
def init_worker():
@@ -350,7 +351,7 @@ def check_symbols_helper(pool, ignore):
# inverse mapping of referenced_features to dict(feature: [files])
inv_map = dict()
- for _file, features in referenced_features.iteritems():
+ for _file, features in referenced_features.items():
for feature in features:
inv_map[feature] = inv_map.get(feature, set())
inv_map[feature].add(_file)
@@ -388,7 +389,7 @@ def parse_source_file(sfile):
if not os.path.exists(sfile):
return references
- with open(sfile, "r") as stream:
+ with open(sfile, "r", encoding='utf-8', errors='replace') as stream:
lines = stream.readlines()
for line in lines:
@@ -437,7 +438,7 @@ def parse_kconfig_file(kfile):
if not os.path.exists(kfile):
return defined, references
- with open(kfile, "r") as stream:
+ with open(kfile, "r", encoding='utf-8', errors='replace') as stream:
lines = stream.readlines()
for i in range(len(lines)):