Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lint: Fix redundant stripping of strings.

This commit is contained in:
Tim Abbott 2016-06-17 10:41:39 -07:00
parent 267a71cf20
commit d117ec8664
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/lint-all
View File

@ -95,6 +95,8 @@ def custom_check_file(fn, rules, skip_rules=None):
failed = False failed = False
lineFlag = False lineFlag = False
for i, line in enumerate(open(fn)): for i, line in enumerate(open(fn)):
line_newline_stripped = line.strip('\n')
line_fully_stripped = line_newline_stripped.strip()
skip = False skip = False
lineFlag = True lineFlag = True
for rule in skip_rules or []: for rule in skip_rules or []:
@ -107,10 +109,16 @@ def custom_check_file(fn, rules, skip_rules=None):
if fn in exclude_list: if fn in exclude_list:
continue continue
exclude_list = rule.get('exclude_line', set()) exclude_list = rule.get('exclude_line', set())
if (fn, line.strip()) in exclude_list: if (fn, line_fully_stripped) in exclude_list:
continue continue
try: try:
if re.search(rule['pattern'], line.strip(rule.get('strip', None))): line_to_check = line_fully_stripped
if rule.get('strip') is not None:
if rule['strip'] == '\n':
line_to_check = line_newline_stripped
else:
raise Exception("Invalid strip rule")
if re.search(rule['pattern'], line_to_check):
sys.stdout.write(rule['description'] + ' at %s line %s:\n' % (fn, i+1)) sys.stdout.write(rule['description'] + ' at %s line %s:\n' % (fn, i+1))
print(line) print(line)
failed = True failed = True