Skip to content
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.

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

Do not block on duplicate base classes #15367

Merged
merged 4 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
19 changes: 15 additions & 4 deletions mypy/semanal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2189,6 +2189,10 @@ def configure_base_classes(
if not self.verify_base_classes(defn):
self.set_dummy_mro(defn.info)
return
if not self.verify_duplicate_base_classes(defn):
# We don't want to block the typechecking process,
# so, we just insert `Any` as the base class and show an error.
self.set_any_mro(defn.info)
self.calculate_class_mro(defn, self.object_type)

def configure_tuple_base_class(self, defn: ClassDef, base: TupleType) -> Instance:
Expand Down Expand Up @@ -2218,6 +2222,11 @@ def set_dummy_mro(self, info: TypeInfo) -> None:
info.mro = [info, self.object_type().type]
info.bad_mro = True

def set_any_mro(self, info: TypeInfo) -> None:
# Give it an MRO consisting direct `Any` subclass.
info.fallback_to_any = True
info.mro = [info, self.object_type().type]

def calculate_class_mro(
self, defn: ClassDef, obj_type: Callable[[], Instance] | None = None
) -> None:
Expand Down Expand Up @@ -2298,12 +2307,14 @@ def verify_base_classes(self, defn: ClassDef) -> bool:
if self.is_base_class(info, baseinfo):
self.fail("Cycle in inheritance hierarchy", defn)
cycle = True
dup = find_duplicate(info.direct_base_classes())
if dup:
self.fail(f'Duplicate base class "{dup.name}"', defn, blocker=True)
return False
return not cycle

def verify_duplicate_base_classes(self, defn: ClassDef) -> bool:
dup = find_duplicate(defn.info.direct_base_classes())
if dup:
self.fail(f'Duplicate base class "{dup.name}"', defn)
return not dup

def is_base_class(self, t: TypeInfo, s: TypeInfo) -> bool:
"""Determine if t is a base class of s (but do not use mro)."""
# Search the base class graph for t, starting from s.
Expand Down
14 changes: 14 additions & 0 deletions test-data/unit/check-classes.test
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,20 @@ class C(str, str):
[out]
sobolevn marked this conversation as resolved.
Show resolved Hide resolved
main:1: error: Duplicate base class "str"

[case testDupBaseClassesIsNotBlocking]
class A:
def method(self) -> str: ...

class B(A, A): # E: Duplicate base class "A"
attr: int

b: B

reveal_type(b.method()) # N: Revealed type is "Any"
reveal_type(b.missing()) # N: Revealed type is "Any"
reveal_type(b.attr) # N: Revealed type is "builtins.int"
[out]

[case testCannotDetermineMro]
class A: pass
class B(A): pass
Expand Down