Change name from StarArg to VarArg

Author: sixolet

extensions/mypy_extensions.py

@@ -115,7 +115,7 @@ def DefaultNamedArg(typ=Any, name=None):
     return typ
 
 
-def StarArg(typ=Any):
+def VarArg(typ=Any):
     return typ
 
 

mypy/messages.py

@@ -88,7 +88,7 @@
     ARG_OPT: "DefaultArg",
     ARG_NAMED: "NamedArg",
     ARG_NAMED_OPT: "DefaultNamedArg",
-    ARG_STAR: "StarArg",
+    ARG_STAR: "VarArg",
     ARG_STAR2: "KwArg",
 }
 

mypy/typeanal.py

@@ -34,7 +34,7 @@
     'mypy_extensions.DefaultArg': nodes.ARG_OPT,
     'mypy_extensions.NamedArg': nodes.ARG_NAMED,
     'mypy_extensions.DefaultNamedArg': nodes.ARG_NAMED_OPT,
-    'mypy_extensions.StarArg': nodes.ARG_STAR,
+    'mypy_extensions.VarArg': nodes.ARG_STAR,
     'mypy_extensions.KwArg': nodes.ARG_STAR2,
 }
 

test-data/unit/check-functions.test

@@ -143,7 +143,7 @@ ee_var = everything
 ee_var = everywhere
 
 ee_var = specific_1 # The difference between Callable[..., blah] and one with a *args: Any, **kwargs: Any is that the ... goes loosely both ways.
-ee_def = specific_1 # E: Incompatible types in assignment (expression has type Callable[[int, str], None], variable has type Callable[[StarArg(Any), KwArg(Any)], None])
+ee_def = specific_1 # E: Incompatible types in assignment (expression has type Callable[[int, str], None], variable has type Callable[[VarArg(Any), KwArg(Any)], None])
 
 [builtins fixtures/dict.pyi]
 
@@ -1409,7 +1409,7 @@ def a(f: F):
 
 [case testCallableParsingFromExpr]
 from typing import Callable
-from mypy_extensions import Arg, StarArg, KwArg
+from mypy_extensions import Arg, VarArg, KwArg
 
 def WrongArg(x, y): return y
 # Note that for this test, the 'Value of type "int" is not indexable' errors are silly,
@@ -1418,10 +1418,10 @@ def WrongArg(x, y): return y
 # that looks like a function call.
 F = Callable[[WrongArg(int, 'x')], int] # E: Unknown argument constructor WrongArg
 G = Callable[[Arg(1, 'x')], int] # E: Invalid type alias # E: Value of type "int" is not indexable
-H = Callable[[StarArg(int, 'x')], int] # E: StarArg should not have a specified name
-I = Callable[[StarArg(int)], int] # ok
-J = Callable[[StarArg(), KwArg()], int] # ok
-K = Callable[[StarArg(), int], int] # E: Required positional args may not appear after default, named or star args
+H = Callable[[VarArg(int, 'x')], int] # E: VarArg should not have a specified name
+I = Callable[[VarArg(int)], int] # ok
+J = Callable[[VarArg(), KwArg()], int] # ok
+K = Callable[[VarArg(), int], int] # E: Required positional args may not appear after default, named or star args
 L = Callable[[Arg(name='x', typ=int)], int] # ok
 # I have commented out the following test because I don't know how to expect the "defined here" note part of the error.
 # M = Callable[[Arg(gnome='x', typ=int)], int] #  Invalid type alias, Unexpected keyword argument "gnome" for "Arg"
@@ -1431,16 +1431,16 @@ N = Callable[[Arg(name=None, typ=int)], int] # ok
 
 [case testCallableParsing]
 from typing import Callable
-from mypy_extensions import Arg, StarArg, KwArg
+from mypy_extensions import Arg, VarArg, KwArg
 
 def WrongArg(x, y): return y
 
 # This test only shows parse-time errors
 def a(f: Callable[[WrongArg(int, 'x')], int]): pass # typeanal-time error
 def b(f: Callable[[Arg(1, 'x')], int]): pass # E: invalid type comment or annotation
-def c(f: Callable[[StarArg(int, 'x')], int]): pass # typeanal-time error
-def d(f: Callable[[StarArg(int)], int]): pass # ok
-def e(f: Callable[[StarArg(), KwArg()], int]): pass # ok
+def c(f: Callable[[VarArg(int, 'x')], int]): pass # typeanal-time error
+def d(f: Callable[[VarArg(int)], int]): pass # ok
+def e(f: Callable[[VarArg(), KwArg()], int]): pass # ok
 def g(f: Callable[[Arg(name='x', typ=int)], int]): pass # ok
 def h(f: Callable[[Arg(gnome='x', typ=int)], int]): pass # E: Unexpected argument "gnome" for argument constructor
 def i(f: Callable[[Arg(name=None, typ=int)], int]): pass # ok
@@ -1461,19 +1461,19 @@ from mypy_extensions import Arg
 def b(f: Callable[[Arg(1, 'x')], int]): pass # E: invalid type comment or annotation
 [builtins fixtures/dict.pyi]
 
-[case testCallableFastParseTooManyStarArg]
+[case testCallableFastParseTooManyVarArg]
 # flags: --fast-parser
 from typing import Callable
-from mypy_extensions import StarArg
-def c(f: Callable[[StarArg(int, 'x')], int]): pass # E: StarArg should not have a specified name
+from mypy_extensions import VarArg
+def c(f: Callable[[VarArg(int, 'x')], int]): pass # E: VarArg should not have a specified name
 [builtins fixtures/dict.pyi]
 
 [case testCallableFastParseGood]
 # flags: --fast-parser
 from typing import Callable
-from mypy_extensions import StarArg, Arg, KwArg
-def d(f: Callable[[StarArg(int)], int]): pass # ok
-def e(f: Callable[[StarArg(), KwArg()], int]): pass # ok
+from mypy_extensions import VarArg, Arg, KwArg
+def d(f: Callable[[VarArg(int)], int]): pass # ok
+def e(f: Callable[[VarArg(), KwArg()], int]): pass # ok
 def g(f: Callable[[Arg(name='x', typ=int)], int]): pass # ok
 def i(f: Callable[[Arg(name=None, typ=int)], int]): pass # ok
 [builtins fixtures/dict.pyi]
@@ -1487,10 +1487,10 @@ def h(f: Callable[[Arg(gnome='x', typ=int)], int]): pass # E: Unexpected argumen
 
 [case testCallableKindsOrdering]
 from typing import Callable
-from mypy_extensions import Arg, StarArg, KwArg, DefaultArg, NamedArg
+from mypy_extensions import Arg, VarArg, KwArg, DefaultArg, NamedArg
 
-def f(f: Callable[[StarArg(), int], int]): pass # E: Required positional args may not appear after default, named or star args
-def g(f: Callable[[StarArg(), StarArg()], int]): pass # E: Star args may not appear after named or star args
+def f(f: Callable[[VarArg(), int], int]): pass # E: Required positional args may not appear after default, named or star args
+def g(f: Callable[[VarArg(), VarArg()], int]): pass # E: Star args may not appear after named or star args
 def h(f: Callable[[KwArg(), KwArg()], int]): pass # E: You may only have one **kwargs argument
 def i(f: Callable[[DefaultArg(), int], int]): pass # E: Required positional args may not appear after default, named or star args
 def j(f: Callable[[NamedArg(int, 'x'), DefaultArg(int, 'y')], int]): pass # E: Positional default args may not appear after named or star args
@@ -1499,7 +1499,7 @@ def j(f: Callable[[NamedArg(int, 'x'), DefaultArg(int, 'y')], int]): pass # E: P
 
 [case testCallableDuplicateNames]
 from typing import Callable
-from mypy_extensions import Arg, StarArg, KwArg, DefaultArg
+from mypy_extensions import Arg, VarArg, KwArg, DefaultArg
 
 def f(f: Callable[[Arg(int, 'x'), int, Arg(int, 'x')], int]): pass # E: duplicate argument 'x' in callable type
 

test-data/unit/check-inference.test

@@ -1048,7 +1048,7 @@ from typing import Callable
 def f(a: Callable[..., None] = lambda *a, **k: None):
     pass
 
-def g(a: Callable[..., None] = lambda *a, **k: 1):  # E: Incompatible types in assignment (expression has type Callable[[StarArg(Any), KwArg(Any)], int], variable has type Callable[..., None])
+def g(a: Callable[..., None] = lambda *a, **k: 1):  # E: Incompatible types in assignment (expression has type Callable[[VarArg(Any), KwArg(Any)], int], variable has type Callable[..., None])
     pass
 [builtins fixtures/dict.pyi]
 

test-data/unit/check-varargs.test

@@ -574,7 +574,7 @@ x = None # type: Callable[[int], None]
 def f(*x: int) -> None: pass
 def g(*x: str) -> None: pass
 x = f
-x = g # E: Incompatible types in assignment (expression has type Callable[[StarArg(str)], None], variable has type Callable[[int], None])
+x = g # E: Incompatible types in assignment (expression has type Callable[[VarArg(str)], None], variable has type Callable[[int], None])
 [builtins fixtures/list.pyi]
 [out]
 

test-data/unit/lib-stub/mypy_extensions.pyi

@@ -15,6 +15,6 @@ def NamedArg(name=None, typ: T = ...) -> T: pass
 
 def DefaultNamedArg(name=None, typ: T = ...) -> T: pass
 
-def StarArg(typ: T = ...) -> T: pass
+def VarArg(typ: T = ...) -> T: pass
 
 def KwArg(typ: T = ...) -> T: pass

test-data/unit/pythoneval.test

@@ -11,7 +11,7 @@ print('hello, world')
 [out]
 hello, world
 
--- Skipped because different typing package versions have different repr()s. 
+-- Skipped because different typing package versions have different repr()s.
 [case testAbstractBaseClasses-skip]
 import re
 from typing import Sized, Sequence, Iterator, Iterable, Mapping, AbstractSet
@@ -756,7 +756,7 @@ def f(*args: str) -> str: return args[0]
 map(f, ['x'])
 map(f, [1])
 [out]
-_program.py:4: error: Argument 1 to "map" has incompatible type Callable[[StarArg(str)], str]; expected Callable[[int], str]
+_program.py:4: error: Argument 1 to "map" has incompatible type Callable[[VarArg(str)], str]; expected Callable[[int], str]
 
 [case testMapStr]
 import typing