3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: Migrate `check_whitespace.py` to python3 

Modified strings used in pattern matching to b-strings as are expected
with python3.

Signed-off-by: Miklos Tusz <miklos@aon3d.com>
This commit is contained in:
Miklós Tusz 2022-03-08 11:49:03 -08:00 committed by KevinOConnor
parent 12e304fbec
commit c8cc2a1e27
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/check_whitespace.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2 #!/usr/bin/env python3
# Check files for whitespace problems # Check files for whitespace problems
# #
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
@ -29,7 +29,7 @@ def check_file(filename):
# Do checks # Do checks
is_source_code = any([filename.endswith(s) for s in ['.c', '.h', '.py']]) is_source_code = any([filename.endswith(s) for s in ['.c', '.h', '.py']])
lineno = 0 lineno = 0
for lineno, line in enumerate(data.split('\n')): for lineno, line in enumerate(data.split(b'\n')):
# Verify line is valid utf-8 # Verify line is valid utf-8
try: try:
line = line.decode('utf-8') line = line.decode('utf-8')
@ -53,9 +53,9 @@ def check_file(filename):
# Check for more than 80 characters # Check for more than 80 characters
if is_source_code and len(line) > 80: if is_source_code and len(line) > 80:
report_error(filename, lineno, "Line longer than 80 characters") report_error(filename, lineno, "Line longer than 80 characters")
if not data.endswith('\n'): if not data.endswith(b'\n'):
report_error(filename, lineno, "No newline at end of file") report_error(filename, lineno, "No newline at end of file")
if data.endswith('\n\n'): if data.endswith(b'\n\n'):
report_error(filename, lineno, "Extra newlines at end of file") report_error(filename, lineno, "Extra newlines at end of file")
def main(): def main():