simplify group init and sprite operations with recursive _SpriteOrIterable type

Author: nachomaiz

buildconfig/stubs/pygame/sprite.pyi

@@ -135,6 +135,8 @@ _TSprite2 = TypeVar("_TSprite2", bound=_SpriteSupportsGroup)
 # almost the same as _TSprite but bound to DirtySprite
 _TDirtySprite = TypeVar("_TDirtySprite", bound=_DirtySpriteSupportsGroup)
 
+_SpriteOrIterable = Union[_TSprite, Iterable[_SpriteOrIterable]]
+
 # Below code demonstrates the advantages of the _SpriteSupportsGroup protocol
 
 # typechecker should error, regular Sprite does not support Group.draw due to
@@ -158,7 +160,9 @@ _TDirtySprite = TypeVar("_TDirtySprite", bound=_DirtySpriteSupportsGroup)
 class AbstractGroup(Generic[_TSprite]):
     spritedict: dict[_TSprite, Optional[Union[FRect, Rect]]]
     lostsprites: list[Union[FRect, Rect]]
-    def __class_getitem__(cls, item: type[_SupportsSpriteGroup], /) -> types.GenericAlias: ...
+    def __class_getitem__(
+        cls, item: type[_SupportsSpriteGroup], /
+    ) -> types.GenericAlias: ...
     def __init__(self) -> None: ...
     def __len__(self) -> int: ...
     def __iter__(self) -> Iterator[_TSprite]: ...
@@ -169,15 +173,9 @@ class AbstractGroup(Generic[_TSprite]):
     def has_internal(self, sprite: _TSprite) -> bool: ...
     def copy(self) -> Self: ...
     def sprites(self) -> list[_TSprite]: ...
-    def add(
-        self, *sprites: Union[_TSprite, AbstractGroup[_TSprite], Iterable[_TSprite]]
-    ) -> None: ...
-    def remove(
-        self, *sprites: Union[_TSprite, AbstractGroup[_TSprite], Iterable[_TSprite]]
-    ) -> None: ...
-    def has(
-        self, *sprites: Union[_TSprite, AbstractGroup[_TSprite], Iterable[_TSprite]]
-    ) -> bool: ...
+    def add(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
+    def remove(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
+    def has(self, *sprites: _SpriteOrIterable[_TSprite]) -> bool: ...
     def update(self, *args: Any, **kwargs: Any) -> None: ...
     def draw(
         self, surface: Surface, bgd: Optional[Surface] = None, special_flags: int = 0
@@ -190,16 +188,14 @@ class AbstractGroup(Generic[_TSprite]):
     def empty(self) -> None: ...
 
 class Group(AbstractGroup[_TSprite]):
-    def __init__(
-        self, *sprites: Union[_TSprite, AbstractGroup[_TSprite], Iterable[_TSprite]]
-    ) -> None: ...
+    def __init__(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
 
 # these are aliased in the code too
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderPlain(Group): ...
+class RenderPlain(Group[_TSprite]): ...
 
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderClear(Group): ...
+class RenderClear(Group[_TSprite]): ...
 
 class RenderUpdates(Group[_TSprite]): ...
 
@@ -208,23 +204,9 @@ class OrderedUpdates(RenderUpdates[_TSprite]): ...
 
 class LayeredUpdates(AbstractGroup[_TSprite]):
     def __init__(
-        self,
-        *sprites: Union[
-            _TSprite,
-            AbstractGroup[_TSprite],
-            Iterable[Union[_TSprite, AbstractGroup[_TSprite]]],
-        ],
-        **kwargs: Any,
-    ) -> None: ...
-    def add(
-        self,
-        *sprites: Union[
-            _TSprite,
-            AbstractGroup[_TSprite],
-            Iterable[Union[_TSprite, AbstractGroup[_TSprite]]],
-        ],
-        **kwargs: Any,
+        self, *sprites: _SpriteOrIterable[_TSprite], **kwargs: Any
     ) -> None: ...
+    def add(self, *sprites: _SpriteOrIterable[_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]: ...
@@ -240,7 +222,6 @@ class LayeredUpdates(AbstractGroup[_TSprite]):
     def switch_layer(self, layer1_nr: int, layer2_nr: int) -> None: ...
 
 class LayeredDirty(LayeredUpdates[_TDirtySprite]):
-    def __init__(self, *sprites: _TDirtySprite, **kwargs: Any) -> None: ...
     def draw(
         self,
         surface: Surface,