Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pyflakes/checker.py
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,10 @@ def NAME(self, node):
raise RuntimeError("Got impossible expression context: %r" % (node.ctx,))

def RETURN(self, node):
if isinstance(self.scope, ClassScope):
self.report(messages.ReturnOutsideFunction, node)
return

if (
node.value and
hasattr(self.scope, 'returnValue') and
Expand Down
7 changes: 7 additions & 0 deletions pyflakes/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,10 @@ class ReturnWithArgsInsideGenerator(Message):
Indicates a return statement with arguments inside a generator.
"""
message = '\'return\' with argument inside generator'


class ReturnOutsideFunction(Message):
"""
Indicates a return statement outside of a function/method.
"""
message = '\'return\' outside function'
9 changes: 9 additions & 0 deletions pyflakes/test/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,15 @@ def Foo():
pass
''', m.RedefinedWhileUnused)

def test_classWithReturn(self):
"""
If a return is used inside a class, a warning is emitted.
"""
self.flakes('''
class Foo(object):
return
''', m.ReturnOutsideFunction)

@skip("todo: Too hard to make this warn but other cases stay silent")
def test_doubleAssignment(self):
"""
Expand Down