From d854d7e2a08b3aaf2192609f641d6c16dfd77d6c Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 7 May 2018 11:21:19 -0700 Subject: [PATCH] Revert "Fix signature of generic_visit method (#2100)" (#2101) This reverts commit 39576c5d413041fa3f3327b85af77a31fccf4a6c. I merged too soon -- tests are failing. --- stdlib/2/ast.pyi | 5 ++--- stdlib/3/ast.pyi | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stdlib/2/ast.pyi b/stdlib/2/ast.pyi index aff644337..e4ba3b6f1 100644 --- a/stdlib/2/ast.pyi +++ b/stdlib/2/ast.pyi @@ -1,7 +1,7 @@ # Python 2.7 ast import typing -from typing import Any, Iterator, TypeVar, Union +from typing import Any, Iterator, Union from _ast import * from _ast import AST, Module @@ -9,7 +9,6 @@ from _ast import AST, Module __version__ = ... # type: str PyCF_ONLY_AST = ... # type: int -_T = TypeVar('_T', bound=AST) def parse(source: Union[str, unicode], filename: Union[str, unicode] = ..., mode: Union[str, unicode] = ...) -> Module: ... def copy_location(new_node: AST, old_node: AST) -> AST: ... @@ -27,4 +26,4 @@ class NodeVisitor(): def generic_visit(self, node: AST) -> None: ... class NodeTransformer(NodeVisitor): - def generic_visit(self, node: _T) -> _T: ... + def generic_visit(self, node: AST) -> None: ... diff --git a/stdlib/3/ast.pyi b/stdlib/3/ast.pyi index 69999dcac..241f874f1 100644 --- a/stdlib/3/ast.pyi +++ b/stdlib/3/ast.pyi @@ -1,18 +1,16 @@ # Python 3.5 ast import typing -from typing import Any, Union, TypeVar, Iterator +from typing import Any, Union, Iterator from _ast import * -_T = TypeVar('_T', bound=AST) - class NodeVisitor(): def visit(self, node: AST) -> Any: ... def generic_visit(self, node: AST) -> None: ... class NodeTransformer(NodeVisitor): - def generic_visit(self, node: _T) -> _T: ... + def generic_visit(self, node: AST) -> None: ... def parse(source: Union[str, bytes], filename: Union[str, bytes] = ..., mode: str = ...) -> Module: ... def copy_location(new_node: AST, old_node: AST) -> AST: ...