10000 Simplify unions when erasing last known values by JukkaL · Pull Request #12064 · python/mypy · GitHub
[go: up one dir, main page]
Skip to content

Simplify unions when erasing last known values #12064

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 4 commits into from
Jan 25, 2022
Merged

Simplify unions when erasing last known values #12064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f13212e
Fix two type inference bugs related to enum value attributes
JukkaL Jan 24, 2022
6f412d1
Revert change to join (and related test case)
JukkaL Jan 25, 2022
6cbb978
Only simplify duplicate instance types in unions
JukkaL Jan 25, 2022
6e147e7
Update mypy/test/typefixture.py
JukkaL Jan 25, 2022
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
Prev Previous commit
Next Next commit
Revert change to join (and related test case)
  • Loading branch information
@JukkaL
JukkaL committed Jan 25, 2022
commit 6f412d12f8f285ffc0ae3e68d87939b42bce1bbc
6 changes: 3 additions & 3 deletions mypy/join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,15 @@ def join_types(s: Type, t: Type, instance_joiner: Optional[InstanceJoiner] = Non
s = mypy.typeops.true_or_false(s)
t = mypy.typeops.true_or_false(t)

if isinstance(s, UnionType) and not isinstance(t, UnionType):
s, t = t, s

if isinstance(s, AnyType):
return s

if isinstance(s, ErasedType):
return t

if isinstance(s, UnionType) and not isinstance(t, UnionType):
s, t = t, s

if isinstance(s, NoneType) and not isinstance(t, NoneType):
s, t = t, s

Expand Down
4 changes: 0 additions & 4 deletions test-data/unit/check-enum.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1881,8 +1881,4 @@ class C(IntEnum):
def f1(c: C) -> None:
x = {'x': c.value}
reveal_type(x) # N: Revealed type is "builtins.dict[builtins.str*, builtins.int]"

def f2(c: C, a: Any) -> None:
x = {'x': c.value, 'y': a}
reveal_type(x) # N: Revealed type is "builtins.dict[builtins.str*, Any]"
[builtins fixtures/dict.pyi]
0