Skip to content

Commit c58a91c

Browse files
committed
! improve show-duplicate-java-classes
- move main logic to main function avoid shadows name warning - rename: optionParser -> option_parser - use print('') to print a new line avoid print '()' under python 2.7 - use single-quoted string instead of double-quoted
1 parent 2816b4a commit c58a91c

File tree

1 file changed

+25
-21
lines changed

1 file changed

+25
-21
lines changed

bin/show-duplicate-java-classes

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def list_class_under_jar_file(jar_file):
3636

3737

3838
def list_class_under_class_dir(class_dir):
39-
return {relpath(dir_path + "/" + filename, class_dir)
39+
return {relpath(dir_path + '/' + filename, class_dir)
4040
for dir_path, _, file_names in walk(class_dir)
4141
for filename in file_names if filename.lower().endswith('.class')}
4242

@@ -67,20 +67,20 @@ def find_duplicate_classes(java_class_2_class_paths):
6767

6868

6969
def print_class_paths(class_paths):
70-
print()
71-
print("=" * 80)
72-
print("class paths to find:")
73-
print("=" * 80)
70+
print('')
71+
print('=' * 80)
72+
print('class paths to find:')
73+
print('=' * 80)
7474
for idx, class_path in enumerate(class_paths):
75-
print("%-3d: %s" % (idx + 1, class_path))
75+
print('%-3d: %s' % (idx + 1, class_path))
7676

7777

78-
if __name__ == '__main__':
79-
optionParser = OptionParser('usage: %prog '
80-
'[-c class-dir1 [-c class-dir2] ...] '
81-
'[lib-dir1|jar-file1 [lib-dir2|jar-file2] ...]')
82-
optionParser.add_option("-c", "--class-dir", dest="class_dirs", default=[], action="append", help="add class dir")
83-
options, libs = optionParser.parse_args()
78+
def main():
79+
option_parser = OptionParser('usage: %prog '
80+
'[-c class-dir1 [-c class-dir2] ...] '
81+
'[lib-dir1|jar-file1 [lib-dir2|jar-file2] ...]')
82+
option_parser.add_option('-c', '--class-dir', dest='class_dirs', default=[], action='append', help='add class dir')
83+
options, libs = option_parser.parse_args()
8484

8585
if not options.class_dirs and not libs:
8686
libs = ['.']
@@ -91,22 +91,26 @@ if __name__ == '__main__':
9191
class_path_2_duplicate_classes = find_duplicate_classes(java_class_2_class_paths)
9292

9393
if not class_path_2_duplicate_classes:
94-
print("COOL! No duplicate classes found!")
94+
print('COOL! No duplicate classes found!')
9595
print_class_paths(class_paths)
9696
exit()
9797

98-
print("Found duplicate classes in below class path:")
98+
print('Found duplicate classes in below class path:')
9999
for idx, jars in enumerate(class_path_2_duplicate_classes):
100-
print("%-3d(%d@%d): %s" % (idx + 1, len(class_path_2_duplicate_classes[jars]), len(jars), " ".join(jars)))
100+
print('%-3d(%d@%d): %s' % (idx + 1, len(class_path_2_duplicate_classes[jars]), len(jars), ' '.join(jars)))
101101

102-
print()
103-
print("=" * 80)
104-
print("Duplicate classes detail info:")
105-
print("=" * 80)
102+
print('')
103+
print('=' * 80)
104+
print('Duplicate classes detail info:')
105+
print('=' * 80)
106106
for idx, (jars, classes) in enumerate(class_path_2_duplicate_classes.items()):
107-
print("%-3d(%d@%d): %s" % (idx + 1, len(class_path_2_duplicate_classes[jars]), len(jars), " ".join(jars)))
107+
print('%-3d(%d@%d): %s' % (idx + 1, len(class_path_2_duplicate_classes[jars]), len(jars), ' '.join(jars)))
108108
for i, c in enumerate(classes):
109-
print("\t%-3d %s" % (i + 1, c))
109+
print('\t%-3d %s' % (i + 1, c))
110110

111111
print_class_paths(class_paths)
112112
exit(1)
113+
114+
115+
if __name__ == '__main__':
116+
main()

0 commit comments

Comments
 (0)