[Python-checkins] gh-102444: Fix minor bugs in `test_typing` highlighted by pyflakes (GH-102445)
miss-islington
webhook-mailer at python.org
Sun Mar 5 17:01:02 EST 2023
https://github.com/python/cpython/commit/a7ec32e7d407f6d86c89a78d91502fa412681536
commit: a7ec32e7d407f6d86c89a78d91502fa412681536
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2023-03-05T14:00:56-08:00
summary:
gh-102444: Fix minor bugs in `test_typing` highlighted by pyflakes (GH-102445)
(cherry picked from commit 96e10229292145012bc462a6ab3ce1626c8acf71)
Co-authored-by: Alex Waygood <Alex.Waygood at Gmail.com>
files:
M Lib/test/test_typing.py
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 4fe17a655dfd..c222df41e90b 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -469,7 +469,6 @@ def test_var_substitution(self):
def test_bad_var_substitution(self):
T = TypeVar('T')
- P = ParamSpec("P")
bad_args = (
(), (int, str), Union,
Generic, Generic[T], Protocol, Protocol[T],
@@ -1033,8 +1032,6 @@ class G2(Generic[Unpack[Ts]]): pass
def test_repr_is_correct(self):
Ts = TypeVarTuple('Ts')
- T = TypeVar('T')
- T2 = TypeVar('T2')
class G1(Generic[*Ts]): pass
class G2(Generic[Unpack[Ts]]): pass
@@ -1304,7 +1301,7 @@ def test_callable_args_are_correct(self):
i = Callable[[None], *Ts]
j = Callable[[None], Unpack[Ts]]
self.assertEqual(i.__args__, (type(None), *Ts))
- self.assertEqual(i.__args__, (type(None), Unpack[Ts]))
+ self.assertEqual(j.__args__, (type(None), Unpack[Ts]))
k = Callable[[None], tuple[int, *Ts]]
l = Callable[[None], Tuple[int, Unpack[Ts]]]
@@ -1432,8 +1429,6 @@ def g(*args: *Ts): pass
self.assertEqual(g.__annotations__, {'args': (*Ts,)[0]})
def test_variadic_args_with_ellipsis_annotations_are_correct(self):
- Ts = TypeVarTuple('Ts')
-
def a(*args: *tuple[int, ...]): pass
self.assertEqual(a.__annotations__,
{'args': (*tuple[int, ...],)[0]})
@@ -4769,7 +4764,6 @@ def test_overload_registry_repeated(self):
# Definitions needed for features introduced in Python 3.6
from test import ann_module, ann_module2, ann_module3, ann_module5, ann_module6
-import asyncio
T_a = TypeVar('T_a')
@@ -6898,16 +6892,6 @@ class C:
self.assertEqual(get_type_hints(C, globals())['classvar'], ClassVar[int])
self.assertEqual(get_type_hints(C, globals())['const'], Final[int])
- def test_hash_eq(self):
- self.assertEqual(len({Annotated[int, 4, 5], Annotated[int, 4, 5]}), 1)
- self.assertNotEqual(Annotated[int, 4, 5], Annotated[int, 5, 4])
- self.assertNotEqual(Annotated[int, 4, 5], Annotated[str, 4, 5])
- self.assertNotEqual(Annotated[int, 4], Annotated[int, 4, 4])
- self.assertEqual(
- {Annotated[int, 4, 5], Annotated[int, 4, 5], Annotated[T, 4, 5]},
- {Annotated[int, 4, 5], Annotated[T, 4, 5]}
- )
-
def test_cannot_subclass(self):
with self.assertRaisesRegex(TypeError, "Cannot subclass .*Annotated"):
class C(Annotated):
@@ -7335,7 +7319,6 @@ class Y(Generic[P, T]):
self.assertEqual(B.__args__, ((int, str,), Tuple[bytes, float]))
def test_var_substitution(self):
- T = TypeVar("T")
P = ParamSpec("P")
subst = P.__typing_subst__
self.assertEqual(subst((int, str)), (int, str))
@@ -7628,7 +7611,7 @@ def test_special_attrs2(self):
self.assertEqual(fr.__module__, 'typing')
# Forward refs are currently unpicklable.
for proto in range(pickle.HIGHEST_PROTOCOL + 1):
- with self.assertRaises(TypeError) as exc:
+ with self.assertRaises(TypeError):
pickle.dumps(fr, proto)
self.assertEqual(SpecialAttrsTests.TypeName.__name__, 'TypeName')
More information about the Python-checkins
mailing list