Remove sprite type vars to follow pep 8

Author: aatle

buildconfig/stubs/pygame/sprite.pyi

@@ -73,30 +73,30 @@ class DirtySprite(Sprite):
     visible: int
     _layer: int
 
-_TSprite = TypeVar("_TSprite", bound=Sprite)
-_TSprite2 = TypeVar("_TSprite2", bound=Sprite)
-_TDirtySprite = TypeVar("_TDirtySprite", bound=DirtySprite)
+_SpriteT = TypeVar("_SpriteT", bound=Sprite)
+_SpriteT2 = TypeVar("_SpriteT2", bound=Sprite)
+_DirtySpriteT = TypeVar("_DirtySpriteT", bound=DirtySprite)
 
-_GroupOrGroups = Union[AbstractGroup[_TSprite], Iterable[_GroupOrGroups[_TSprite]]]
-_SpriteOrSprites = Union[_TSprite, Iterable[_SpriteOrSprites[_TSprite]]]
+_GroupOrGroups = Union[AbstractGroup[_SpriteT], Iterable[_GroupOrGroups[_SpriteT]]]
+_SpriteOrSprites = Union[_SpriteT, Iterable[_SpriteOrSprites[_SpriteT]]]
 
-class AbstractGroup(Generic[_TSprite]):
-    spritedict: dict[_TSprite, Optional[Union[FRect, Rect]]]
+class AbstractGroup(Generic[_SpriteT]):
+    spritedict: dict[_SpriteT, Optional[Union[FRect, Rect]]]
     lostsprites: list[Union[FRect, Rect]]
     def __class_getitem__(cls, item: Any, /) -> types.GenericAlias: ...
     def __init__(self) -> None: ...
     def __len__(self) -> int: ...
-    def __iter__(self) -> Iterator[_TSprite]: ...
+    def __iter__(self) -> Iterator[_SpriteT]: ...
     def __bool__(self) -> bool: ...
     def __contains__(self, item: Any) -> bool: ...
-    def add_internal(self, sprite: _TSprite, layer: None = None) -> None: ...
-    def remove_internal(self, sprite: _TSprite) -> None: ...
-    def has_internal(self, sprite: _TSprite) -> bool: ...
+    def add_internal(self, sprite: _SpriteT, layer: None = None) -> None: ...
+    def remove_internal(self, sprite: _SpriteT) -> None: ...
+    def has_internal(self, sprite: _SpriteT) -> bool: ...
     def copy(self) -> Self: ...
-    def sprites(self) -> list[_TSprite]: ...
-    def add(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
-    def remove(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
-    def has(self, *sprites: _SpriteOrSprites[_TSprite]) -> bool: ...
+    def sprites(self) -> list[_SpriteT]: ...
+    def add(self, *sprites: _SpriteOrSprites[_SpriteT]) -> None: ...
+    def remove(self, *sprites: _SpriteOrSprites[_SpriteT]) -> None: ...
+    def has(self, *sprites: _SpriteOrSprites[_SpriteT]) -> bool: ...
     def update(self, *args: Any, **kwargs: Any) -> None: ...
     def draw(
         self, surface: Surface, bgd: Optional[Surface] = None, special_flags: int = 0
@@ -108,39 +108,39 @@ class AbstractGroup(Generic[_TSprite]):
     ) -> None: ...
     def empty(self) -> None: ...
 
-class Group(AbstractGroup[_TSprite]):
-    def __init__(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
+class Group(AbstractGroup[_SpriteT]):
+    def __init__(self, *sprites: _SpriteOrSprites[_SpriteT]) -> None: ...
 
 # these are aliased in the code too
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderPlain(Group[_TSprite]): ...
+class RenderPlain(Group[_SpriteT]): ...
 
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderClear(Group[_TSprite]): ...
+class RenderClear(Group[_SpriteT]): ...
 
-class RenderUpdates(Group[_TSprite]): ...
+class RenderUpdates(Group[_SpriteT]): ...
 
 @deprecated("Use `pygame.sprite.RenderUpdates` instead")
-class OrderedUpdates(RenderUpdates[_TSprite]): ...
-
-class LayeredUpdates(AbstractGroup[_TSprite]):
-    def __init__(self, *sprites: _SpriteOrSprites[_TSprite], **kwargs: Any) -> None: ...
-    def add(self, *sprites: _SpriteOrSprites[_TSprite], **kwargs: Any) -> None: ...
-    def get_sprites_at(self, pos: Point) -> list[_TSprite]: ...
-    def get_sprite(self, idx: int) -> _TSprite: ...
-    def remove_sprites_of_layer(self, layer_nr: int) -> list[_TSprite]: ...
+class OrderedUpdates(RenderUpdates[_SpriteT]): ...
+
+class LayeredUpdates(AbstractGroup[_SpriteT]):
+    def __init__(self, *sprites: _SpriteOrSprites[_SpriteT], **kwargs: Any) -> None: ...
+    def add(self, *sprites: _SpriteOrSprites[_SpriteT], **kwargs: Any) -> None: ...
+    def get_sprites_at(self, pos: Point) -> list[_SpriteT]: ...
+    def get_sprite(self, idx: int) -> _SpriteT: ...
+    def remove_sprites_of_layer(self, layer_nr: int) -> list[_SpriteT]: ...
     def layers(self) -> list[int]: ...
-    def change_layer(self, sprite: _TSprite, new_layer: int) -> None: ...
-    def get_layer_of_sprite(self, sprite: _TSprite) -> int: ...
+    def change_layer(self, sprite: _SpriteT, new_layer: int) -> None: ...
+    def get_layer_of_sprite(self, sprite: _SpriteT) -> int: ...
     def get_top_layer(self) -> int: ...
     def get_bottom_layer(self) -> int: ...
-    def move_to_front(self, sprite: _TSprite) -> None: ...
-    def move_to_back(self, sprite: _TSprite) -> None: ...
-    def get_top_sprite(self) -> _TSprite: ...
-    def get_sprites_from_layer(self, layer: int) -> list[_TSprite]: ...
+    def move_to_front(self, sprite: _SpriteT) -> None: ...
+    def move_to_back(self, sprite: _SpriteT) -> None: ...
+    def get_top_sprite(self) -> _SpriteT: ...
+    def get_sprites_from_layer(self, layer: int) -> list[_SpriteT]: ...
     def switch_layer(self, layer1_nr: int, layer2_nr: int) -> None: ...
 
-class LayeredDirty(LayeredUpdates[_TDirtySprite]):
+class LayeredDirty(LayeredUpdates[_DirtySpriteT]):
     def draw(
         self,
         surface: Surface,
@@ -158,9 +158,9 @@ class LayeredDirty(LayeredUpdates[_TDirtySprite]):
     )
     def set_timing_treshold(self, time_ms: SupportsFloat) -> None: ...
 
-class GroupSingle(AbstractGroup[_TSprite]):
-    sprite: Optional[_TSprite]
-    def __init__(self, sprite: Optional[_TSprite] = None) -> None: ...
+class GroupSingle(AbstractGroup[_SpriteT]):
+    sprite: Optional[_SpriteT]
+    def __init__(self, sprite: Optional[_SpriteT] = None) -> None: ...
 
 def collide_rect(left: _HasRect, right: _HasRect) -> bool: ...
 
@@ -191,23 +191,23 @@ def collide_mask(
     left: _SupportsCollideMask, right: _SupportsCollideMask
 ) -> Optional[tuple[int, int]]: ...
 
-_THasRect = TypeVar("_THasRect", bound=_HasRect)
+_HasRectT = TypeVar("_HasRectT", bound=_HasRect)
 
 def spritecollide(
-    sprite: _THasRect,
-    group: AbstractGroup[_TSprite],
+    sprite: _HasRectT,
+    group: AbstractGroup[_SpriteT],
     dokill: bool,
-    collided: Optional[Callable[[_THasRect, _TSprite], Any]] = None,
-) -> list[_TSprite]: ...
+    collided: Optional[Callable[[_HasRectT, _SpriteT], Any]] = None,
+) -> list[_SpriteT]: ...
 def groupcollide(
-    groupa: AbstractGroup[_TSprite],
-    groupb: AbstractGroup[_TSprite2],
+    groupa: AbstractGroup[_SpriteT],
+    groupb: AbstractGroup[_SpriteT2],
     dokilla: bool,
     dokillb: bool,
-    collided: Optional[Callable[[_TSprite, _TSprite2], Any]] = None,
-) -> dict[_TSprite, list[_TSprite2]]: ...
+    collided: Optional[Callable[[_SpriteT, _SpriteT2], Any]] = None,
+) -> dict[_SpriteT, list[_SpriteT2]]: ...
 def spritecollideany(
-    sprite: _THasRect,
-    group: AbstractGroup[_TSprite],
-    collided: Optional[Callable[[_THasRect, _TSprite], Any]] = None,
-) -> Optional[_TSprite]: ...
+    sprite: _HasRectT,
+    group: AbstractGroup[_SpriteT],
+    collided: Optional[Callable[[_HasRectT, _SpriteT], Any]] = None,
+) -> Optional[_SpriteT]: ...