Skip to content

Reset to previous statement when leaving return in semanal #19642

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

Merged
merged 1 commit into from
Aug 14, 2025
Merged

Reset to previous statement when leaving return in semanal #19642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5332,13 +5332,15 @@ def visit_expression_stmt(self, s: ExpressionStmt) -> None:
s.expr.accept(self)

def visit_return_stmt(self, s: ReturnStmt) -> None:
old = self.statement
self.statement = s
if not self.is_func_scope():
self.fail('"return" outside function', s)
if self.return_stmt_inside_except_star_block:
self.fail('"return" not allowed in except* block', s, serious=True)
if s.expr:
s.expr.accept(self)
self.statement = old

def visit_raise_stmt(self, s: RaiseStmt) -> None:
self.statement = s
Expand Down
15 changes: 15 additions & 0 deletions test-data/unit/check-classes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9258,3 +9258,18 @@ main:5: note: def __eq__(self, other: object) -> bool:
main:5: note: if not isinstance(other, C):
main:5: note: return NotImplemented
main:5: note: return <logic to compare two C instances>

[case testLambdaInAttributeCallValue]
# https://github.com/python/mypy/issues/19632
import foo

def nop(fn: object) -> foo.Bar:
return foo.Bar()

class Bar:
foo: foo.Bar = nop(
lambda: 0
)
[file foo.py]
class Bar:
...
Loading