Split E125 for visual indent versus hanging indent; issue #126

Author: florentx

CHANGES.txt

@@ -7,6 +7,9 @@ Changelog
 
 * Honor ``# noqa`` for errors E711 and E712. (Issue #180)
 
+* Report E129 instead of E125 for visually indented line with same
+  indent as next logical line.  (Issue #126)
+
 
 1.4.5 (2013-03-06)
 ------------------

docs/intro.rst

@@ -199,14 +199,16 @@ This is the current list of error and warning codes:
 +----------+----------------------------------------------------------------------+
 | E124 (^) | closing bracket does not match visual indentation                    |
 +----------+----------------------------------------------------------------------+
-| E125 (^) | continuation line does not distinguish itself from next logical line |
+| E125 (^) | continuation line with same indent as next logical line              |
 +----------+----------------------------------------------------------------------+
 | E126 (^) | continuation line over-indented for hanging indent                   |
 +----------+----------------------------------------------------------------------+
 | E127 (^) | continuation line over-indented for visual indent                    |
 +----------+----------------------------------------------------------------------+
 | E128 (^) | continuation line under-indented for visual indent                   |
 +----------+----------------------------------------------------------------------+
+| E129 (^) | visually indented line with same indent as next logical line         |
++----------+----------------------------------------------------------------------+
 +----------+----------------------------------------------------------------------+
 | **E2**   | *Whitespace*                                                         |
 +----------+----------------------------------------------------------------------+

pep8.py

@@ -542,8 +542,11 @@ def continued_indentation(logical_line, tokens, indent_level, noqa, verbose):
         last_token_multiline = (start[0] != end[0])
 
     if indent_next and rel_indent[-1] == 4:
-        yield (last_indent, "E125 continuation line does not distinguish "
-               "itself from next logical line")
+        if visual_indent:
+            code = "E129 visually indented line"
+        else:
+            code = "E125 continuation line"
+        yield (last_indent, "%s with same indent as next logical line" % code)
 
 
 def whitespace_before_parameters(logical_line, tokens):

testsuite/E12.py

@@ -15,7 +15,7 @@
 #: E124
 a = (123,
 )
-#: E125
+#: E129
 if (row < 0 or self.moduleCount <= row or
     col < 0 or self.moduleCount <= col):
     raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
@@ -92,7 +92,7 @@ def qualify_by_address(
     self, cr, uid, ids, context=None,
     params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)):
     """ This gets called by the web server """
-#: E125
+#: E129
 if (a == 2 or
     b == "abc def ghi"
     "jkl mno"):