[minor] rename visitor method for better consistency

python · Aug 29, 2020 · 7b9a052 · 7b9a052
1 parent 5dd28ed
commit 7b9a052
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -3974,7 +3974,7 @@ def visit_temp_node(self, e: TempNode) -> Type:
     def visit_type_var_expr(self, e: TypeVarExpr) -> Type:
         return AnyType(TypeOfAny.special_form)
 
-    def visit_paramspec_var_expr(self, e: ParamSpecExpr) -> Type:
+    def visit_paramspec_expr(self, e: ParamSpecExpr) -> Type:
         return AnyType(TypeOfAny.special_form)
 
     def visit_newtype_expr(self, e: NewTypeExpr) -> Type:

diff --git a/mypy/literals.py b/mypy/literals.py
@@ -213,7 +213,7 @@ def visit_backquote_expr(self, e: BackquoteExpr) -> None:
     def visit_type_var_expr(self, e: TypeVarExpr) -> None:
         return None
 
-    def visit_paramspec_var_expr(self, e: ParamSpecExpr) -> None:
+    def visit_paramspec_expr(self, e: ParamSpecExpr) -> None:
         return None
 
     def visit_type_alias_expr(self, e: TypeAliasExpr) -> None:

diff --git a/mypy/nodes.py b/mypy/nodes.py
@@ -2120,7 +2120,7 @@ def deserialize(cls, data: JsonDict) -> 'TypeVarExpr':
 
 class ParamSpecExpr(TypeVarLikeExpr):
     def accept(self, visitor: ExpressionVisitor[T]) -> T:
-        return visitor.visit_paramspec_var_expr(self)
+        return visitor.visit_paramspec_expr(self)
 
     def serialize(self) -> JsonDict:
         return {

diff --git a/mypy/strconv.py b/mypy/strconv.py
@@ -467,7 +467,7 @@ def visit_type_var_expr(self, o: 'mypy.nodes.TypeVarExpr') -> str:
             a += ['UpperBound({})'.format(o.upper_bound)]
         return self.dump(a, o)
 
-    def visit_paramspec_var_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> str:
+    def visit_paramspec_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> str:
         import mypy.types
         a = []  # type: List[Any]
         if o.variance == mypy.nodes.COVARIANT:

diff --git a/mypy/treetransform.py b/mypy/treetransform.py
@@ -498,7 +498,7 @@ def visit_type_var_expr(self, node: TypeVarExpr) -> TypeVarExpr:
                            self.types(node.values),
                            self.type(node.upper_bound), variance=node.variance)
 
-    def visit_paramspec_var_expr(self, node: ParamSpecExpr) -> ParamSpecExpr:
+    def visit_paramspec_expr(self, node: ParamSpecExpr) -> ParamSpecExpr:
         return ParamSpecExpr(
             node.name, node.fullname, self.type(node.upper_bound), variance=node.variance
         )

diff --git a/mypy/visitor.py b/mypy/visitor.py
@@ -156,7 +156,7 @@ def visit_type_var_expr(self, o: 'mypy.nodes.TypeVarExpr') -> T:
         pass
 
     @abstractmethod
-    def visit_paramspec_var_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> T:
+    def visit_paramspec_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> T:
         pass
 
     @abstractmethod
@@ -533,7 +533,7 @@ def visit_backquote_expr(self, o: 'mypy.nodes.BackquoteExpr') -> T:
     def visit_type_var_expr(self, o: 'mypy.nodes.TypeVarExpr') -> T:
         pass
 
-    def visit_paramspec_var_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> T:
+    def visit_paramspec_expr(self, o: 'mypy.nodes.ParamSpecExpr') -> T:
         pass
 
     def visit_type_alias_expr(self, o: 'mypy.nodes.TypeAliasExpr') -> T:

diff --git a/mypyc/irbuild/visitor.py b/mypyc/irbuild/visitor.py
@@ -309,7 +309,7 @@ def visit_type_application(self, o: TypeApplication) -> Value:
     def visit_type_var_expr(self, o: TypeVarExpr) -> Value:
         assert False, "can't compile analysis-only expressions"
 
-    def visit_paramspec_var_expr(self, o: ParamSpecExpr) -> Value:
+    def visit_paramspec_expr(self, o: ParamSpecExpr) -> Value:
         assert False, "can't compile analysis-only expressions"
 
     def visit_typeddict_expr(self, o: TypedDictExpr) -> Value: