Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Check duplicate bases when defining TypedDict #11485

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
JelleZijlstra merged 3 commits into from
Nov 8, 2021
Merged

Check duplicate bases when defining TypedDict #11485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe6fca5
Fix
97littleleaf11 Nov 7, 2021
6ef1337
Fix type check
97littleleaf11 Nov 7, 2021
028211b
Reorder if-else branches
97littleleaf11 Nov 8, 2021
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
29 changes: 23 additions & 6 deletions mypy/semanal_typeddict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,30 @@ def analyze_typeddict_classdef(self, defn: ClassDef) -> Tuple[bool, Optional[Typ
defn.analyzed.line = defn.line
defn.analyzed.column = defn.column
return True, info

# Extending/merging existing TypedDicts
if any(not isinstance(expr, RefExpr) or
expr.fullname not in TPDICT_NAMES and
not self.is_typeddict(expr) for expr in defn.base_type_exprs):
self.fail("All bases of a new TypedDict must be TypedDict types", defn)
typeddict_bases = list(filter(self.is_typeddict, defn.base_type_exprs))
typeddict_bases = []
typeddict_bases_set = set()
for expr in defn.base_type_exprs:
if isinstance(expr, RefExpr) and expr.fullname in TPDICT_NAMES:
if 'TypedDict' not in typeddict_bases_set:
typeddict_bases_set.add('TypedDict')
else:
self.fail('Duplicate base class "TypedDict"', defn)
elif isinstance(expr, RefExpr) and self.is_typeddict(expr):
assert expr.fullname
if expr.fullname not in typeddict_bases_set:
typeddict_bases_set.add(expr.fullname)
typeddict_bases.append(expr)
else:
assert isinstance(expr.node, TypeInfo)
self.fail('Duplicate base class "%s"' % expr.node.name, defn)
else:
self.fail("All bases of a new TypedDict must be TypedDict types", defn)

keys: List[str] = []
types = []
required_keys = set()

# Iterate over bases in reverse order so that leftmost base class' keys take precedence
for base in reversed(typeddict_bases):
assert isinstance(base, RefExpr)
Expand Down Expand Up @@ -328,3 +342,6 @@ def is_typeddict(self, expr: Expression) -> bool:

def fail(self, msg: str, ctx: Context, *, code: Optional[ErrorCode] = None) -> None:
self.api.fail(msg, ctx, code=code)

def note(self, msg: str, ctx: Context) -> None:
self.api.note(msg, ctx)
15 changes: 15 additions & 0 deletions test-data/unit/check-typeddict.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,21 @@ p: Point2D
reveal_type(p) # N: Revealed type is "TypedDict('__main__.Point2D', {'x': builtins.int, 'y': builtins.int})"
[builtins fixtures/dict.pyi]

[case testCannotCreateTypedDictWithDuplicateBases]
# https://github.com/python/mypy/issues/3673
from typing import TypedDict

class A(TypedDict):
x: str
y: int

class B(A, A): # E: Duplicate base class "A"
z: str

class C(TypedDict, TypedDict): # E: Duplicate base class "TypedDict"
c1: int
[typing fixtures/typing-typeddict.pyi]

[case testCannotCreateTypedDictWithClassWithOtherStuff]
# flags: --python-version 3.6
from mypy_extensions import TypedDict
Expand Down