diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index 7438c8c15..7a6f8b57f 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -342,6 +342,11 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None): if any((url in line) for url in ('file://', 'http://', 'https://')): return True + # If 'line-too-long' is explictly suppressed for the line, any length is + # acceptable. + if 'pylint: disable=line-too-long' in line and file_extension == 'py': + return True + if line_len > extra_maxlen: return False @@ -351,9 +356,6 @@ def CheckLongLines(input_api, output_api, maxlen, source_file_filter=None): if '