diff --git a/src/etc/tidy.py b/src/etc/tidy.py index 4202950d259..eff967bf6ce 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -1,15 +1,10 @@ #!/usr/bin/python -import sys, fileinput, subprocess +import sys, fileinput err=0 cols=78 -config_proc=subprocess.Popen([ "git", "config", "core.autocrlf" ], - stdout=subprocess.PIPE) -result=config_proc.communicate()[0] -autocrlf=result.strip() == b"true" if result is not None else False - def report_err(s): global err print("%s:%d: %s" % (fileinput.filename(), fileinput.filelineno(), s)) @@ -19,11 +14,10 @@ for line in fileinput.input(openhook=fileinput.hook_encoded("utf-8")): if line.find('\t') != -1 and fileinput.filename().find("Makefile") == -1: report_err("tab character") - if not autocrlf and line.find('\r') != -1: + if line.find('\r') != -1: report_err("CR character") - line_len = len(line)-2 if autocrlf else len(line)-1 - if line_len > cols: + if len(line)-1 > cols: report_err("line longer than %d chars" % cols)