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.

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

Fix "Implicit type aliases not recognised with PEP 604 + import cycles" (but only for stubs) #11915

Merged
merged 8 commits into from
Jan 30, 2022
Merged

Fix "Implicit type aliases not recognised with PEP 604 + import cycles" (but only for stubs) #11915

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b61755
Initial commit
AlexWaygood Jan 5, 2022
dfd1a27
Add a regression test
AlexWaygood Jan 20, 2022
7eac592
Fix merge conflicts
AlexWaygood Jan 20, 2022
6ad7790
Move test
AlexWaygood Jan 20, 2022
2890f8f
Add x-fail test for `.py` files
AlexWaygood Jan 20, 2022
8f2cc84
Add back whitespace
AlexWaygood Jan 20, 2022
ab8f572
Merge remote-tracking branch 'origin/master' into fix-import-cycles-604
AlexWaygood Jan 30, 2022
964a7de
Reduce size of regression tests
AlexWaygood Jan 30, 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
13 changes: 8 additions & 5 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,11 +2201,14 @@ def can_be_type_alias(self, rv: Expression, allow_none: bool = False) -> bool:
return True
if allow_none and isinstance(rv, NameExpr) and rv.fullname == 'builtins.None':
return True
if (isinstance(rv, OpExpr)
and rv.op == '|'
and self.can_be_type_alias(rv.left, allow_none=True)
and self.can_be_type_alias(rv.right, allow_none=True)):
return True
if isinstance(rv, OpExpr) and rv.op == '|':
if self.is_stub_file:
return True
if (
self.can_be_type_alias(rv.left, allow_none=True)
and self.can_be_type_alias(rv.right, allow_none=True)
):
return True
return False

def is_type_ref(self, rv: Expression, bare: bool = False) -> bool:
Expand Down