Allows python line with pylint: disable=line-too-long to have more than 120 chars

presubmit_canned_checks.py

Index: presubmit_canned_checks.py
diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index 7438c8c15ba566ff2f3d837113ee5af1066333c9..7a6f8b57f7e2cb48beda6711656e5c5b72eefe06 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 '<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)