Allow long lines in comments too, with similar rules; related to issue #224

Author: florentx

CHANGES.txt

@@ -11,6 +11,12 @@ Changelog
 
 * Fix regression with multiple brackets. (Issue #214)
 
+* Allow long lines in multiline strings and comments if they cannot
+  be wrapped. (Issue #224).
+
+* Optionally disable physical line checks inside multiline strings,
+  using ``# noqa``. (Issue #242)
+
 
 1.4.6 (2013-07-02)
 ------------------

pep8.py

@@ -218,7 +218,14 @@ def maximum_line_length(physical_line, max_line_length, multiline):
     if length > max_line_length and not noqa(line):
         # Sometimes, long lines in docstrings are hard to avoid -- like,
         # a long URL that can't be wrapped because it has no whitespace.
-        if multiline and re.match(r'^\s*\S+$', line):
+        # And similar case exists with URL in comments.
+        #
+        # A check is added to still report the error when the 72 first
+        # chars are whitespaces (79 - 7).
+        chunks = line.split()
+        if ((len(chunks) == 1 and multiline) or
+            (len(chunks) == 2 and chunks[0] == '#')) and \
+                len(line) - len(chunks[-1]) < max_line_length - 7:
             return
         if hasattr(line, 'decode'):   # Python 2
             # The line could contain multi-byte characters
@@ -1351,8 +1358,8 @@ def generate_tokens(self):
         tokengen = tokenize.generate_tokens(self.readline)
         try:
             for token in tokengen:
-                yield token
                 self.maybe_check_physical(token)
+                yield token
         except (SyntaxError, tokenize.TokenError):
             self.report_invalid_syntax()
 
@@ -1365,7 +1372,7 @@ def maybe_check_physical(self, token):
         if token[0] in (tokenize.NEWLINE, tokenize.NL):
             # Obviously, a newline token ends a single physical line.
             self.check_physical(token[4])
-        elif token[0] == tokenize.STRING and token[1].count('\n'):
+        elif token[0] == tokenize.STRING and '\n' in token[1]:
             # Less obviously, a string that contains newlines is a
             # multiline string, either triple-quoted or with internal
             # newlines backslash-escaped. Check every physical line in the

testsuite/E50.py

@@ -68,3 +68,37 @@
 #: E501
 """
 longnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaces"""
+#: Okay
+"""
+This
+                                                                       almost_empty_line
+"""
+#: E501
+"""
+This
+                                                                        almost_empty_line
+"""
+#: E501
+# A basic comment
+# with a long long long long long long long long long long long long long long long long line
+
+#
+#: Okay
+# I'm some great comment.  Because I'm so great, I'm going to give you a
+# reference to some valuable information about some API that I'm calling:
+#
+#     http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
+
+import this
+
+# longnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaces
+
+#
+#: Okay
+# This
+#                                                                      almost_empty_line
+
+#
+#: E501
+# This
+#                                                                       almost_empty_line

testsuite/utf-8.py

@@ -31,11 +31,11 @@ def __init__(self, width, height,
 # 78 narrow chars (Na) + 1 wide char (W)
 # 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8情
 
-# 2 narrow chars (Na) + 40 wide chars (W)
-# 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+# 3 narrow chars (Na) + 40 wide chars (W)
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
 
-# 2 narrow chars (Na) + 77 wide chars (W)
-# 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+# 3 narrow chars (Na) + 76 wide chars (W)
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
 
 #
 #: E501
@@ -47,6 +47,6 @@ def __init__(self, width, height,
 # 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8情情
 #
 #: E501
-# 2 narrow chars (Na) + 78 wide chars (W)
-# 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+# 3 narrow chars (Na) + 77 wide chars (W)
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
 #