Skip to content

Commit 8c49d05

Browse files
authored
bpo-46359: Modernize test_typing by removing checks for EOL Python versions (GH-30563)
Also removes unused tests meant for older versions of Python.
1 parent c590b58 commit 8c49d05

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

Lib/test/test_typing.py

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,13 +1940,12 @@ class A(Generic[T]):
19401940
self.assertNotEqual(typing.FrozenSet[A[str]],
19411941
typing.FrozenSet[mod_generics_cache.B.A[str]])
19421942

1943-
if sys.version_info[:2] > (3, 2):
1944-
self.assertTrue(repr(Tuple[A[str]]).endswith('<locals>.A[str]]'))
1945-
self.assertTrue(repr(Tuple[B.A[str]]).endswith('<locals>.B.A[str]]'))
1946-
self.assertTrue(repr(Tuple[mod_generics_cache.A[str]])
1947-
.endswith('mod_generics_cache.A[str]]'))
1948-
self.assertTrue(repr(Tuple[mod_generics_cache.B.A[str]])
1949-
.endswith('mod_generics_cache.B.A[str]]'))
1943+
self.assertTrue(repr(Tuple[A[str]]).endswith('<locals>.A[str]]'))
1944+
self.assertTrue(repr(Tuple[B.A[str]]).endswith('<locals>.B.A[str]]'))
1945+
self.assertTrue(repr(Tuple[mod_generics_cache.A[str]])
1946+
.endswith('mod_generics_cache.A[str]]'))
1947+
self.assertTrue(repr(Tuple[mod_generics_cache.B.A[str]])
1948+
.endswith('mod_generics_cache.B.A[str]]'))
19501949

19511950
def test_extended_generic_rules_eq(self):
19521951
T = TypeVar('T')
@@ -2065,11 +2064,9 @@ class MyDict(typing.Dict[T, T]): ...
20652064
class MyDef(typing.DefaultDict[str, T]): ...
20662065
self.assertIs(MyDef[int]().__class__, MyDef)
20672066
self.assertEqual(MyDef[int]().__orig_class__, MyDef[int])
2068-
# ChainMap was added in 3.3
2069-
if sys.version_info >= (3, 3):
2070-
class MyChain(typing.ChainMap[str, T]): ...
2071-
self.assertIs(MyChain[int]().__class__, MyChain)
2072-
self.assertEqual(MyChain[int]().__orig_class__, MyChain[int])
2067+
class MyChain(typing.ChainMap[str, T]): ...
2068+
self.assertIs(MyChain[int]().__class__, MyChain)
2069+
self.assertEqual(MyChain[int]().__orig_class__, MyChain[int])
20732070

20742071
def test_all_repr_eq_any(self):
20752072
objs = (getattr(typing, el) for el in typing.__all__)
@@ -4096,14 +4093,6 @@ def test_basics(self):
40964093
self.assertEqual(Emp.__annotations__,
40974094
collections.OrderedDict([('name', str), ('id', int)]))
40984095

4099-
def test_namedtuple_pyversion(self):
4100-
if sys.version_info[:2] < (3, 6):
4101-
with self.assertRaises(TypeError):
4102-
NamedTuple('Name', one=int, other=str)
4103-
with self.assertRaises(TypeError):
4104-
class NotYet(NamedTuple):
4105-
whatever = 0
4106-
41074096
def test_annotation_usage(self):
41084097
tim = CoolEmployee('Tim', 9000)
41094098
self.assertIsInstance(tim, CoolEmployee)

0 commit comments

Comments
 (0)