Skip to content

Commit 5d8e11a

Browse files
committed
remove 3.8 compat
1 parent 7f3b58f commit 5d8e11a

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

src_py/sprite.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,10 @@
8484
# specific ones that aren't quite so general but fit into common
8585
# specialized cases.
8686

87-
import sys
87+
import types
8888
from typing import Optional
8989
from warnings import warn
9090

91-
if sys.version_info[:3] >= (3, 9, 0):
92-
from types import GenericAlias
93-
else:
94-
from typing import _GenericAlias as GenericAlias # type: ignore[name-defined]
95-
9691
import pygame
9792
from pygame.mask import from_surface
9893
from pygame.rect import Rect
@@ -377,7 +372,7 @@ class AbstractGroup:
377372
"""
378373

379374
def __class_getitem__(cls, generic):
380-
return GenericAlias(cls, generic)
375+
return types.GenericAlias(cls, generic)
381376

382377
# protected identifier value to identify sprite groups, and avoid infinite recursion
383378
_spritegroup = True

test/sprite_test.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
#################################### IMPORTS ###################################
22

3-
import sys
3+
import types
44
import typing
55
import unittest
66

7-
if sys.version_info[:3] >= (3, 9, 0):
8-
from types import GenericAlias
9-
else:
10-
from typing import _GenericAlias as GenericAlias # type: ignore[name-defined]
11-
127
import pygame
138
from pygame import sprite
149

@@ -671,7 +666,7 @@ def test_type_subscript(self):
671666
except TypeError as e:
672667
self.fail(e)
673668

674-
self.assertIsInstance(group_generic_alias, GenericAlias)
669+
self.assertIsInstance(group_generic_alias, types.GenericAlias)
675670
self.assertIs(typing.get_origin(group_generic_alias), sprite.Group)
676671
self.assertEqual(typing.get_args(group_generic_alias), (sprite.Sprite,))
677672

0 commit comments

Comments
 (0)