signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix pre-commit block format script

Browse Source 
Python 3 removed the [`cmp` function][0] which this script relied on.
Calling it was unnecessary, so I removed it (and cleaned up some of the
surrounding code).

Tested this with the `--all`, `--path`, and `--ref` flags.

[0]: https://docs.python.org/2.7/library/functions.html#cmp
This commit is contained in:
Evan Hahn 2022-03-22 10:21:58 -05:00
parent 007415832e
commit a7d5f778e2
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Scripts/precommit.py
View File

@ -130,26 +130,8 @@ def sort_include_block(text, filepath, filename, file_extension):
includes = other_includes
def formatBlock(includes):
lines = [include.format() for include in includes]
lines = list(set(lines))
def include_sorter(a, b):
# return cmp(a.lower(), b.lower())
return cmp(a, b)
# print 'before'
# for line in lines:
# print '\t', line
# print
lines.sort(include_sorter)
# print 'after'
# for line in lines:
# print '\t', line
# print
# print
# print 'filepath'
# for line in lines:
# print '\t', line
# print
return '\n'.join(lines)
lines = set([include.format() for include in includes])
return "\n".join(sorted(lines))
includeAngles = [include for include in includes if include.isInclude and not include.isQuote]
includeQuotes = [include for include in includes if include.isInclude and include.isQuote]