Index: presubmit_canned_checks.py |
diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py |
index 620661f38e96b7a71a80eb73d4f8edf39a8de5de..5ed86568fffec4c766f90d8de396673e2ea6fda7 100644 |
--- a/presubmit_canned_checks.py |
+++ b/presubmit_canned_checks.py |
@@ -345,11 +345,14 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None): |
OBJC_FILE_EXTS = ('h', 'm', 'mm') |
OBJC_EXCEPTIONS = ('#define', '#endif', '#if', '#import', '#include', |
'#pragma') |
+ PY_FILE_EXTS = ('py') |
+ PY_EXCEPTIONS = ('import', 'from') |
LANGUAGE_EXCEPTIONS = [ |
(CPP_FILE_EXTS, CPP_EXCEPTIONS), |
(JAVA_FILE_EXTS, JAVA_EXCEPTIONS), |
(OBJC_FILE_EXTS, OBJC_EXCEPTIONS), |
+ (PY_FILE_EXTS, PY_EXCEPTIONS), |
] |
def no_long_lines(file_extension, line): |
@@ -381,6 +384,9 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None): |
if '<include' in line and file_extension in ('css', 'html', 'js'): |
return True |
+ if 'pylint: disable=line-too-long' in line and file_extension == 'py': |
+ return True |
+ |
return input_api.re.match( |
r'.*[A-Za-z][A-Za-z_0-9]{%d,}.*' % long_symbol, line) |