Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5747 - dhananjay92:Issue#5730, r=jdm

Browse source 
This PR does two things.
* Solve Issue #5730 
* Refactor `tidy.py` to reduce code duplication.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5747)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-21 12:59:39 -05:00
commit d654eada6f
1 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
python/tidy.py
View file

@ -12,6 +12,7 @@
import os
import fnmatch
import itertools
import re
from licenseck import licenses
directories_to_check = ["ports", "components", "tests"]
@ -66,16 +67,19 @@ def check_license(contents):
yield (1, "incorrect license")
def check_length(contents):
lines = contents.splitlines(True)
for idx, line in enumerate(lines):
def check_length(idx, line):
if len(line) >= 160:
yield (idx + 1, "(much) overlong line")
def check_whatwg_url(idx, line):
matches = re.findall(r'whatwg.org/multipage.*#', line);
if matches:
for i, match in enumerate(matches):
parts = match.split('multipage')
if len(parts[1]) > 1 and parts[1][1] != '#':
yield (idx + 1, "URL should not point to specific WHATWG multipage page!")
def check_whitespace(contents):
lines = contents.splitlines(True)
for idx, line in enumerate(lines):
def check_whitespace(idx, line):
if line[-1] == "\n":
line = line[:-1]
else:
@ -90,6 +94,12 @@ def check_whitespace(contents):
if "\r" in line:
yield (idx + 1, "CR on line")
def check_by_line(contents):
lines = contents.splitlines(True)
for idx, line in enumerate(lines):
for error in itertools.chain(check_length(idx, line), check_whitespace(idx, line), check_whatwg_url(idx, line)):
yield error
def collect_errors_for_files(files_to_check, checking_functions):
for file_name in files_to_check:
@ -127,7 +137,7 @@ def scan():
all_files = collect_file_names(directories_to_check)
files_to_check = filter(should_check, all_files)
checking_functions = [check_license, check_length, check_whitespace]
checking_functions = [check_license, check_by_line]
errors = collect_errors_for_files(files_to_check, checking_functions)
reftest_files = collect_file_names(reftest_directories)