Skip to content

Commit

Permalink
Use 'in' instead of 'find()' in tidy.py
Browse files Browse the repository at this point in the history
'x in y' is more Pythonic and faster than 'y.find(x) != -1'.
  • Loading branch information
iKevinY committed Jan 18, 2015
1 parent dcaeb6a commit 21f4483
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/etc/tidy.py
Expand Up @@ -58,14 +58,14 @@ def do_license_check(name, contents):
for line in fileinput.input(file_names,
openhook=fileinput.hook_encoded("utf-8")):

if fileinput.filename().find("tidy.py") == -1:
if line.find(cr_flag) != -1:
if "tidy.py" not in fileinput.filename():
if cr_flag in line:
check_cr = False
if line.find(tab_flag) != -1:
if tab_flag in line:
check_tab = False
if line.find(linelength_flag) != -1:
if linelength_flag in line:
check_linelength = False
if line.find("TODO") != -1:
if "TODO" in line:
report_err("TODO is deprecated; use FIXME")
match = re.match(r'^.*/(\*|/!?)\s*XXX', line)
if match:
Expand All @@ -86,10 +86,10 @@ def do_license_check(name, contents):
if "SNAP" in line:
report_warn("unmatched SNAP line: " + line)

if check_tab and (line.find('\t') != -1 and
fileinput.filename().find("Makefile") == -1):
if check_tab and ('\t' in line and
"Makefile" not in fileinput.filename()):
report_err("tab character")
if check_cr and not autocrlf and line.find('\r') != -1:
if check_cr and not autocrlf and '\r' in line:
report_err("CR character")
if line.endswith(" \n") or line.endswith("\t\n"):
report_err("trailing whitespace")
Expand Down

0 comments on commit 21f4483

Please sign in to comment.