MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve linter disabling somewhat

develop
lethosor 2016-02-01 09:39:40 -05:00
parent 881fd6bd8d
commit 2556b319f0
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
travis/lint.py
Unescape Escape View File

@ -26,6 +26,7 @@ def error(msg):
class LinterError(Exception): pass class LinterError(Exception): pass
class Linter(object): class Linter(object):
ignore = False
def check(self, lines): def check(self, lines):
failures = [] failures = []
for i, line in enumerate(lines): for i, line in enumerate(lines):
@ -65,19 +66,18 @@ class Linter(object):
class NewlineLinter(Linter): class NewlineLinter(Linter):
msg = 'Contains DOS-style newlines' msg = 'Contains DOS-style newlines'
def __init__(self): # git supports newline conversion. Catch in CI, ignore on Windows.
# git supports newline conversion. Catch in CI, ignore on Windows. ignore = os.linesep != '\n' and not os.environ.get('TRAVIS')
self.ignore = sys.platform == 'win32' and not os.environ.get('TRAVIS')
def check_line(self, line): def check_line(self, line):
return self.ignore or '\r' not in line return '\r' not in line
def fix_line(self, line): def fix_line(self, line):
return line.replace('\r', '') return line.replace('\r', '')
class TrailingWhitespaceLinter(Linter): class TrailingWhitespaceLinter(Linter):
msg = 'Contains trailing whitespace' msg = 'Contains trailing whitespace'
def check_line(self, line): def check_line(self, line):
line = line.replace('\r', '') line = line.replace('\r', '').replace('\n', '')
return not line.strip() or (not line.endswith(' ') and not line.endswith('\t')) return not line.strip() or line == line.rstrip('\t ')
def fix_line(self, line): def fix_line(self, line):
return line.rstrip('\t ') return line.rstrip('\t ')
@ -88,7 +88,7 @@ class TabLinter(Linter):
def fix_line(self, line): def fix_line(self, line):
return line.replace('\t', ' ') return line.replace('\t', ' ')
linters = [cls() for cls in Linter.__subclasses__()] linters = [cls() for cls in Linter.__subclasses__() if not cls.ignore]
def main(): def main():
root_path = os.path.abspath(sys.argv[1] if len(sys.argv) > 1 else '.') root_path = os.path.abspath(sys.argv[1] if len(sys.argv) > 1 else '.')