summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormemeplex <carlosjosepita@gmail.com>2016-06-28 22:43:34 -0300
committermemeplex <carlosjosepita@gmail.com>2016-06-28 22:43:34 -0300
commit98dee57c033626e34fe96bef7f86e48dbb71c121 (patch)
tree968d26d2c3d836ecbabcce054c722591e26a72bf
parent36e3400f65268d1ee76845a74aae5b0112182ef8 (diff)
downloadpep8-98dee57c033626e34fe96bef7f86e48dbb71c121.tar.gz
Improve error message and add some comments
-rwxr-xr-xpycodestyle.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pycodestyle.py b/pycodestyle.py
index a043f04..708b286 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -273,6 +273,7 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number,
DOCSTRING_REGEX.match(previous_logical)):
ancestor_level = indent_level
nested = False
+ # Search backwards for a def ancestor or tree root (top level).
for line in lines[line_number - 2::-1]:
if line.strip() and expand_indent(line) < ancestor_level:
ancestor_level = expand_indent(line)
@@ -280,8 +281,8 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number,
if nested or ancestor_level == 0:
break
if nested:
- yield 0, "E306 expected 1 blank line, found 0" \
- " (nested definition)"
+ yield 0, "E306 expected 1 blank line before a " \
+ "nested definition, found 0"
else:
yield 0, "E301 expected 1 blank line, found 0"
elif blank_before != 2: