Honor the # noqa in addition to # nopep8

2 files changed, 8 insertions, 2 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 301a013..73acb2b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,8 @@ Changelog
 
 * Report E703 instead of E702 for the trailing semicolon. (Issue #117)
 
+* Honor ``# noqa`` in addition to ``# no pep8``. (Issue #149)
+
 
 1.4 (2012-12-22)
 ----------------
diff --git a/pep8.py b/pep8.py
index b406b81..91dd469 100755
--- a/pep8.py
+++ b/pep8.py
@@ -217,7 +217,7 @@ def maximum_line_length(physical_line, max_line_length):
     line = physical_line.rstrip()
     length = len(line)
     if length > max_line_length:
-        if line.strip().lower().endswith('# nopep8'):
+        if noqa(line):
             return
         if hasattr(line, 'decode'):   # Python 2
             # The line could contain multi-byte characters
@@ -434,7 +434,7 @@ def continuation_line_indentation(logical_line, tokens, indent_level, verbose):
         print(">>> " + tokens[0][4].rstrip())
 
     for token_type, text, start, end, line in tokens:
-        if line.strip().lower().endswith('# nopep8'):
+        if noqa(line):
             continue
 
         newline = row < start[0] - first_row
@@ -1102,6 +1102,10 @@ def mute_string(text):
     return text[:start] + 'x' * (end - start) + text[end:]
 
 
+def noqa(line):
+    return line.strip().lower().endswith(('# noqa', '# nopep8'))
+
+
 def parse_udiff(diff, patterns=None, parent='.'):
     """Return a dictionary of matching lines."""
     # For each file of the diff, the entry key is the filename,