diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/find-headers-to-move-inside-modules.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/bin/find-headers-to-move-inside-modules.py b/bin/find-headers-to-move-inside-modules.py index af2ca619a461..9ec0f623128d 100755 --- a/bin/find-headers-to-move-inside-modules.py +++ b/bin/find-headers-to-move-inside-modules.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Look for headers inside include/ that can be moved into their respective modules. # Not 100% accurate @@ -11,18 +11,18 @@ a = subprocess.Popen("git ls-files include/", stdout=subprocess.PIPE, shell=True with a.stdout as txt: for line in txt: header = line[8:].strip(); - if "README" in header: continue - if header == "version.hrc": continue + if b"README" in header: continue + if header == b"version.hrc": continue # ignore URE headers - if header.startswith("IwyuFilter_include.yaml"): continue - if header.startswith("cppu/"): continue - if header.startswith("cppuhelper/"): continue - if header.startswith("osl/"): continue - if header.startswith("sal/"): continue - if header.startswith("salhelper/"): continue - if header.startswith("uno/"): continue + if header.startswith(b"IwyuFilter_include.yaml"): continue + if header.startswith(b"cppu/"): continue + if header.startswith(b"cppuhelper/"): continue + if header.startswith(b"osl/"): continue + if header.startswith(b"sal/"): continue + if header.startswith(b"salhelper/"): continue + if header.startswith(b"uno/"): continue # these are direct copies of mozilla code - if header.startswith("onlineupdate/mozilla/"): continue + if header.startswith(b"onlineupdate/mozilla/"): continue headerSet.add(header) headerSetUnused = headerSet.copy() @@ -30,24 +30,24 @@ headerSetOnlyInOwnModule = headerSet.copy() a = subprocess.Popen("git grep '^#include <'", stdout=subprocess.PIPE, shell=True) with a.stdout as txt: for line in txt: - idx1 = line.find("#include <") - idx2 = line.find(">", idx1 + 10) + idx1 = line.find(b"#include <") + idx2 = line.find(b">", idx1 + 10) include = line[idx1 + 10 : idx2] headerSetUnused.discard(include) # - idx1 = line.find("/") + idx1 = line.find(b"/") includedFromModule = line[0 : idx1] - idx1 = include.find("/") + idx1 = include.find(b"/") module = include[0 : idx1] if module != includedFromModule: headerSetOnlyInOwnModule.discard(include) -print "completely unused" -print "----------------------------" +print("completely unused") +print("----------------------------") for x in sorted(headerSetUnused): - print x -print "" -print "only used in own module" -print "----------------------------" + print(x) +print("") +print("only used in own module") +print("----------------------------") for x in sorted(headerSetOnlyInOwnModule): - print x + print(x) |