Skip to content

Support recursive TypedDicts #13373

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
ilevkivskyi merged 15 commits into from
Aug 11, 2022
Merged

Support recursive TypedDicts #13373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f0163c4
Try another approach
ilevkivskyi Aug 9, 2022
dde4b92
Fix/simplify things
ilevkivskyi Aug 9, 2022
50279ba
Add more tests; fix fine-grained
ilevkivskyi Aug 9, 2022
68263ee
Fix regular tuple bases and newtypes
ilevkivskyi Aug 9, 2022
786655b
Fix newtype tests
ilevkivskyi Aug 9, 2022
952692b
Cleanup; add more tests
ilevkivskyi Aug 9, 2022
3aeb470
More cleanup and tests
ilevkivskyi Aug 9, 2022
404d8d1
Fix mypyc
ilevkivskyi Aug 9, 2022
27b8e35
Merge remote-tracking branch 'upstream/master' into recursive-named-t…
ilevkivskyi Aug 9, 2022
786f256
Support recursive TypedDicts
ilevkivskyi Aug 9, 2022
2dfd5c2
Fix accidentaly uncovered NewType bug
ilevkivskyi Aug 10, 2022
f377d6b
Add a comment
ilevkivskyi Aug 10, 2022
fd6620f
Merge remote-tracking branch 'upstream/master' into recursive-typed-d…
ilevkivskyi Aug 10, 2022
a5e06dc
Fix merge
ilevkivskyi Aug 10, 2022
bb94c80
Fix self-check; formatting; more tests
ilevkivskyi Aug 10, 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
Fix regular tuple bases and newtypes
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Aug 9, 2022
commit 68263eeb68feb6e9e120cf3d66ba93e774325006
7 changes: 7 additions & 0 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,6 +1841,13 @@ def configure_tuple_base_class(self, defn: ClassDef, base: TupleType) -> Instanc
self.fail("Class has two incompatible bases derived from tuple", defn)
defn.has_incompatible_baseclass = True
info.tuple_type = base
[]))
if not info.tuple_alias:
info.tuple_alias = TypeAlias(target, info.fullname, info.line, info.column)
else:
if has_placeholder(info.tuple_alias.target):
self.defer(force_progress=True)
info.tuple_alias.target = target

if base.partial_fallback.type.fullname == "builtins.tuple":
# Fallback can only be safely calculated after semantic analysis, since base
Expand Down
1 change: 1 addition & 0 deletions mypy/semanal_newtype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ def process_newtype_declaration(self, s: AssignmentStmt) -> bool:
name, old_type, old_type.partial_fallback, s.line
)
newtype_class_info.tuple_type = old_type
newtype_class_info.tuple_alias = old_type.partial_fallback.type.tuple_alias
elif isinstance(old_type, Instance):
if old_type.type.is_protocol:
self.fail("NewType cannot be used with protocol classes", s)
Expand Down
15 changes: 8 additions & 7 deletions test-data/unit/check-recursive-types.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ class B(Tuple[B, int]):
x: int

b, _ = x
reveal_type(b.x)
reveal_type(b.x) # N:Revealed type is "builtins.int"
[builtins fixtures/tuple.pyi]

[case testBasicTupleClassesNewType]
Expand All @@ -492,17 +492,18 @@ from typing import Tuple, NamedTuple, NewType
x: C
class B(Tuple[B, int]):
x: int
C = NewType(B)
C = NewType("C", B)
b, _ = x
reveal_type(b.x)
reveal_type(b) # N: Revealed type is "Tuple[..., builtins.int, fallback=__main__.B]"
reveal_type(b.x) # N: Revealed type is "builtins.int"

y: BNT
y: CNT
class BNT(NamedTuple):
x: BNT
x: CNT
y: int
CNT = NewType(BNT)
CNT = NewType("CNT", BNT)
bnt, _ = y
reveal_type(bnt.y)
reveal_type(bnt.y) # N: Revealed type is "builtins.int"
[builtins fixtures/tuple.pyi]

-- TODO: Add more fine-grained tests for various kinds of recursive types
Expand Down