Skip to content

Commit

Permalink
pythongh-102444: Fix minor bugs in test_typing highlighted by pyfla…
Browse files Browse the repository at this point in the history
…kes (python#102445)
  • Loading branch information
AlexWaygood authored Mar 5, 2023
1 parent 3222054 commit 96e1022
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions Lib/test/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,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],
Expand Down Expand Up @@ -1037,8 +1036,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
Expand Down Expand Up @@ -1307,7 +1304,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]]]
Expand Down Expand Up @@ -1435,8 +1432,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]})
Expand Down Expand Up @@ -4918,7 +4913,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')

Expand Down Expand Up @@ -7077,16 +7071,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):
Expand Down Expand Up @@ -7515,7 +7499,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))
Expand Down Expand Up @@ -7835,7 +7818,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')
Expand Down

0 comments on commit 96e1022

Please sign in to comment.