Skip to content

Fix #28 #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
attilaolah wants to merge 2 commits into from
Closed

Fix #28 #219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d4740
a simple fix for nested functions (fixes #28)
attilaolah Jul 12, 2013
6ec4af6
import test case from https://github.com/JensRantil/pep8/commit/82c3a…
attilaolah Jul 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions pep8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def maximum_line_length(physical_line, max_line_length):


def blank_lines(logical_line, blank_lines, indent_level, line_number,
previous_logical, previous_indent_level):
previous_logical, previous_indent_level, nested_function):
r"""
Separate top-level function and class definitions with two blank lines.

Expand All @@ -247,6 +247,7 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number,

Okay: def a():\n pass\n\n\ndef b():\n pass
Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass
Okay: def a():\n c = 4\n def b():\n pass

E301: class Foo:\n b = 0\n def bar():\n pass
E302: def a():\n pass\n\ndef b(n):\n pass
Expand All @@ -264,7 +265,8 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number,
elif logical_line.startswith(('def ', 'class ', '@')):
if indent_level:
if not (blank_lines or previous_indent_level < indent_level or
DOCSTRING_REGEX.match(previous_logical)):
DOCSTRING_REGEX.match(previous_logical) or
nested_function):
yield 0, "E301 expected 1 blank line, found 0"
elif blank_lines != 2:
yield 0, "E302 expected 2 blank lines, found %d" % blank_lines
Expand Down Expand Up @@ -1319,6 +1321,12 @@ def check_logical(self):
indent = first_line[:self.mapping[0][1][2][1]]
self.previous_indent_level = self.indent_level
self.indent_level = expand_indent(indent)
for line in reversed(self.lines[:self.line_number]):
if line.startswith('def '):

@attilaolah attilaolah Jul 12, 2013

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder though if this is correct, and how should we handle classes defined inside functions that have methods that are not separated by a blank line.

self.nested_function = True
break
else:
self.nested_function = False
if self.verbose >= 2:
print(self.logical_line[:80].rstrip())
for name, check, argument_names in self._logical_checks:
Expand Down