Skip to content

Correctly type check redefinitions in try's else clause. #1429

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
JukkaL merged 2 commits into from
Apr 25, 2016
Merged

Correctly type check redefinitions in try's else clause. #1429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b5efee
Correctly type check redefinitions in try's else clause.
Apr 22, 2016
bbdad3e
Put a stray `self.breaking_out = False` back in.
Apr 25, 2016
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
11 changes: 8 additions & 3 deletions mypy/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1758,9 +1758,6 @@ def visit_try_stmt(self, s: TryStmt) -> Type:
self.binder.try_frames.add(len(self.binder.frames) - 2)
self.accept(s.body)
self.binder.try_frames.remove(len(self.binder.frames) - 2)
if s.else_body:
self.accept(s.else_body)
self.breaking_out = False
changed, frame_on_completion = self.binder.pop_frame()
completed_frames.append(frame_on_completion)

Copy link
Collaborator

@JukkaL JukkaL Apr 24, 2016

Choose a reason for hiding this comment

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

I suspect that self.breaking_out = False should be left here. I can try to come up with a test case, but if nothing breaks, I'd leave it.

Expand Down Expand Up @@ -1794,6 +1791,14 @@ def visit_try_stmt(self, s: TryStmt) -> Type:
changed, frame_on_completion = self.binder.pop_frame()
completed_frames.append(frame_on_completion)

# Do the else block similar to the way we do except blocks.
if s.else_body:
self.binder.push_frame()
self.accept(s.else_body)
self.breaking_out = False
changed, frame_on_completion = self.binder.pop_frame()
completed_frames.append(frame_on_completion)

self.binder.update_from_options(completed_frames)

if s.finally_body:
Expand Down
18 changes: 18 additions & 0 deletions mypy/test/data/check-statements.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,24 @@ else:
object(None) # E: Too many arguments for "object"
[builtins fixtures/exception.py]

[case testRedefinedFunctionInTryWithElse]
def f() -> None: pass
try:
pass
except BaseException:
f2 = f
else:
def f2() -> str: pass
try:
pass
except BaseException:
f3 = f
else:
def f3() -> None: pass
[builtins fixtures/exception.py]
[out]
main:7: error: Incompatible redefinition (original type Callable[[], None], redefinition with type Callable[[], str])

[case testExceptWithoutType]
import typing
try:
Expand Down