From 21f4483de3a78c843db2a6de49b14d4777b83918 Mon Sep 17 00:00:00 2001 From: Kevin Yap Date: Sun, 18 Jan 2015 14:52:59 -0800 Subject: [PATCH] Use 'in' instead of 'find()' in tidy.py 'x in y' is more Pythonic and faster than 'y.find(x) != -1'. --- src/etc/tidy.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/etc/tidy.py b/src/etc/tidy.py index 3d44c27a16e..68b276559c5 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -58,14 +58,14 @@ try: 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: @@ -86,10 +86,10 @@ try: 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") -- 2.44.0