From 9ea88dd034521126a7dbdfdf8d38bc6480031858 Mon Sep 17 00:00:00 2001
From: Marti Raudsepp <marti@juffo.org>
Date: Mon, 19 Sep 2022 18:02:29 +0300
Subject: [PATCH] Use consistent capitalization of `TypeVar`
Changed `Typevar` -> `TypeVar` in the error message from #13166.
I was testing the mypy 0.980 pre-release builds and noticed that the error message was using inconsistent capitalization.
---
mypy/message_registry.py | 2 +-
test-data/unit/check-classes.test | 2 +-
test-data/unit/check-errorcodes.test | 2 +-
test-data/unit/check-generics.test | 10 +++++-----
test-data/unit/check-inference.test | 4 ++--
test-data/unit/check-parameter-specification.test | 2 +-
test-data/unit/check-typevar-unbound.test | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mypy/message_registry.py b/mypy/message_registry.py
index 6dfc11be5c12..9daa8528e7f6 100644
--- a/mypy/message_registry.py
+++ b/mypy/message_registry.py
@@ -172,7 +172,7 @@ def with_additional_msg(self, info: str) -> ErrorMessage:
TYPEVAR_UNEXPECTED_ARGUMENT: Final = 'Unexpected argument to "TypeVar()"'
UNBOUND_TYPEVAR: Final = (
"A function returning TypeVar should receive at least "
- "one argument containing the same Typevar"
+ "one argument containing the same TypeVar"
)
# Super
diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test
index 3b1eddc8a084..5f1c23b756ed 100644
--- a/test-data/unit/check-classes.test
+++ b/test-data/unit/check-classes.test
@@ -3232,7 +3232,7 @@ def error(u_c: Type[U]) -> P: # Error here, see below
return new_pro(u_c) # Error here, see below
[out]
main:11: note: Revealed type is "__main__.WizUser"
-main:12: error: A function returning TypeVar should receive at least one argument containing the same Typevar
+main:12: error: A function returning TypeVar should receive at least one argument containing the same TypeVar
main:13: error: Value of type variable "P" of "new_pro" cannot be "U"
main:13: error: Incompatible return value type (got "U", expected "P")
diff --git a/test-data/unit/check-errorcodes.test b/test-data/unit/check-errorcodes.test
index 24684c84b76d..401407c9d426 100644
--- a/test-data/unit/check-errorcodes.test
+++ b/test-data/unit/check-errorcodes.test
@@ -254,7 +254,7 @@ z: y # E: Variable "__main__.y" is not valid as a type [valid-type] \
from typing import TypeVar
T = TypeVar('T')
-def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same Typevar [type-var]
+def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same TypeVar [type-var]
x = f() # E: Need type annotation for "x" [var-annotated]
y = [] # E: Need type annotation for "y" (hint: "y: List[<type>] = ...") [var-annotated]
[builtins fixtures/list.pyi]
diff --git a/test-data/unit/check-generics.test b/test-data/unit/check-generics.test
index b8d70d1dae96..b7d98a783a49 100644
--- a/test-data/unit/check-generics.test
+++ b/test-data/unit/check-generics.test
@@ -1557,9 +1557,9 @@ A = TypeVar('A')
B = TypeVar('B')
def f1(x: A) -> A: ...
-def f2(x: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f2(x: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
def f3(x: B) -> B: ...
-def f4(x: int) -> A: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f4(x: int) -> A: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
y1 = f1
if int():
@@ -1608,8 +1608,8 @@ B = TypeVar('B')
T = TypeVar('T')
def outer(t: T) -> None:
def f1(x: A) -> A: ...
- def f2(x: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
- def f3(x: T) -> A: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+ def f2(x: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
+ def f3(x: T) -> A: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
def f4(x: A) -> T: ...
def f5(x: T) -> T: ...
@@ -1778,7 +1778,7 @@ from typing import TypeVar
A = TypeVar('A')
B = TypeVar('B')
def f1(x: int, y: A) -> A: ...
-def f2(x: int, y: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f2(x: int, y: A) -> B: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
def f3(x: A, y: B) -> B: ...
g = f1
g = f2
diff --git a/test-data/unit/check-inference.test b/test-data/unit/check-inference.test
index e90df247a714..9ee8b3989de8 100644
--- a/test-data/unit/check-inference.test
+++ b/test-data/unit/check-inference.test
@@ -448,7 +448,7 @@ g(None) # Ok
f() # Ok because not used to infer local variable type
g(a)
-def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
def g(a: T) -> None: pass
[out]
@@ -2355,7 +2355,7 @@ def main() -> None:
[case testDontMarkUnreachableAfterInferenceUninhabited]
from typing import TypeVar
T = TypeVar('T')
-def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f() -> T: pass # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
class C:
x = f() # E: Need type annotation for "x"
diff --git a/test-data/unit/check-parameter-specification.test b/test-data/unit/check-parameter-specification.test
index 09779f94461a..b5b851a581ce 100644
--- a/test-data/unit/check-parameter-specification.test
+++ b/test-data/unit/check-parameter-specification.test
@@ -1066,7 +1066,7 @@ def callback(func: Callable[[Any], Any]) -> None: ...
class Job(Generic[P]): ...
@callback
-def run_job(job: Job[...]) -> T: ... # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def run_job(job: Job[...]) -> T: ... # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
[builtins fixtures/tuple.pyi]
[case testTupleAndDictOperationsOnParamSpecArgsAndKwargs]
diff --git a/test-data/unit/check-typevar-unbound.test b/test-data/unit/check-typevar-unbound.test
index 8761cd94027e..d7df9ad6d94a 100644
--- a/test-data/unit/check-typevar-unbound.test
+++ b/test-data/unit/check-typevar-unbound.test
@@ -4,7 +4,7 @@ from typing import TypeVar
T = TypeVar('T')
-def f() -> T: # E: A function returning TypeVar should receive at least one argument containing the same Typevar
+def f() -> T: # E: A function returning TypeVar should receive at least one argument containing the same TypeVar
...
f()