Skip to content

Use "|" union syntax in type aliases and base classes too #6612

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

Closed
Akuli wants to merge 12 commits into from
Closed

Use "|" union syntax in type aliases and base classes too #6612

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
558faba
modify script
Akuli Dec 16, 2021
dc67692
pipe output of tests/check_new_syntax.py to quick and dirty fixing sc…
Akuli Dec 16, 2021
c1ac285
manual fixes
Akuli Dec 16, 2021
885094b
clean imports based on pyright output, with script
Akuli Dec 16, 2021
4a859fd
fix syntax errors
Akuli Dec 16, 2021
a51e3da
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2021
d6ed9d3
revert changes in a few files
Akuli Dec 16, 2021
a7b0d67
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 16, 2021
0ccbff3
Merge branch 'master' into newsyntax
srittau Dec 17, 2021
dae33e5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 17, 2021
700b615
Revert changes to many files
Akuli Dec 17, 2021
e8d6b0e
make exclude list more specific
Akuli Dec 17, 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
Next Next commit
modify script
  • Loading branch information
@Akuli
Akuli committed Dec 16, 2021
commit 558faba999d271a9835713ef3907518da9cce60f
18 changes: 14 additions & 4 deletions tests/check_new_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ def is_dotdotdot(node: ast.AST) -> bool:
def add_contextlib_alias_error(node: ast.ImportFrom | ast.Attribute, alias: str) -> None:
errors.append(f"{path}:{node.lineno}: Use `contextlib.{CONTEXT_MANAGER_ALIASES[alias]}` instead of `typing.{alias}`")

# TODO: Get rid of this class. It skips checking type aliases and base
# classes, but those can now be checked too, with new mypy version.
class OldSyntaxFinder(ast.NodeVisitor):
def __init__(self, *, set_from_collections_abc: bool) -> None:
self.set_from_collections_abc = set_from_collections_abc
Expand Down Expand Up @@ -67,10 +69,6 @@ def visit_Subscript(self, node: ast.Subscript) -> None:

self.generic_visit(node)

# This doesn't check type aliases (or type var bounds, etc), since those are not
# currently supported
#
# TODO: can use built-in generics in type aliases
class AnnotationFinder(ast.NodeVisitor):
def __init__(self) -> None:
self.set_from_collections_abc = False
Expand All @@ -79,6 +77,16 @@ def old_syntax_finder(self) -> OldSyntaxFinder:
"""Convenience method to create an `OldSyntaxFinder` instance with the correct state"""
return OldSyntaxFinder(set_from_collections_abc=self.set_from_collections_abc)

def visit_Subscript(self, node: ast.Subscript) -> None:
if isinstance(node.value, ast.Name):
if node.value.id == "Union" and isinstance(node.slice, ast.Tuple):
new_syntax = " | ".join(ast.unparse(x) for x in node.slice.elts)
errors.append(f"{path}:{node.lineno}: Use PEP 604 syntax for Union, e.g. `{new_syntax}`")
if node.value.id == "Optional":
new_syntax = f"{ast.unparse(node.slice)} | None"
errors.append(f"{path}:{node.lineno}: Use PEP 604 syntax for Optional, e.g. `{new_syntax}`")
self.generic_visit(node)

def visit_ImportFrom(self, node: ast.ImportFrom) -> None:
if node.module == "collections.abc":
imported_classes = node.names
Expand All @@ -102,10 +110,12 @@ def visit_Attribute(self, node: ast.Attribute) -> None:

def visit_AnnAssign(self, node: ast.AnnAssign) -> None:
self.old_syntax_finder().visit(node.annotation)
self.generic_visit(node)

def visit_arg(self, node: ast.arg) -> None:
if node.annotation is not None:
self.old_syntax_finder().visit(node.annotation)
self.generic_visit(node)

def visit_FunctionDef(self, node: ast.FunctionDef) -> None:
if node.returns is not None:
Expand Down