Type _GroupOrGroups, rename _SpriteOrIterable

Author: aatle

buildconfig/stubs/pygame/sprite.pyi

@@ -64,8 +64,8 @@ class _SupportsSprite(_HasImageAndRect, Protocol):
     def add_internal(self, group: _Group) -> None: ...
     def remove_internal(self, group: _Group) -> None: ...
     def update(self, *args: Any, **kwargs: Any) -> None: ...
-    def add(self, *groups: _Group) -> None: ...
-    def remove(self, *groups: _Group) -> None: ...
+    def add(self, *groups: _GroupOrGroups[Any]) -> None: ...
+    def remove(self, *groups: _GroupOrGroups[Any]) -> None: ...
     def kill(self) -> None: ...
     def alive(self) -> bool: ...
     def groups(self) -> list[_Group]: ...
@@ -94,12 +94,12 @@ class Sprite(_SupportsSprite):
     def layer(self) -> int: ...
     @layer.setter
     def layer(self, value: int) -> None: ...
-    def __init__(self, *groups: _Group) -> None: ...
+    def __init__(self, *groups: _GroupOrGroups[Any]) -> None: ...
     def add_internal(self, group: _Group) -> None: ...
     def remove_internal(self, group: _Group) -> None: ...
     def update(self, *args: Any, **kwargs: Any) -> None: ...
-    def add(self, *groups: _Group) -> None: ...
-    def remove(self, *groups: _Group) -> None: ...
+    def add(self, *groups: _GroupOrGroups[Any]) -> None: ...
+    def remove(self, *groups: _GroupOrGroups[Any]) -> None: ...
     def kill(self) -> None: ...
     def alive(self) -> bool: ...
     def groups(self) -> list[AbstractGroup[_SupportsSprite]]: ...
@@ -120,8 +120,8 @@ _TSprite = TypeVar("_TSprite", bound=_SupportsSprite)
 _TSprite2 = TypeVar("_TSprite2", bound=_SupportsSprite)
 _TDirtySprite = TypeVar("_TDirtySprite", bound=_SupportsDirtySprite)
 
-# typevar for sprite or iterable of sprites, used in Group init, add and remove
-_SpriteOrIterable = Union[_TSprite, Iterable[_SpriteOrIterable[_TSprite]]]
+_GroupOrGroups = Union[AbstractGroup[_TSprite], Iterable[_GroupOrGroups[_TSprite]]]
+_SpriteOrSprites = Union[_TSprite, Iterable[_SpriteOrSprites[_TSprite]]]
 
 class AbstractGroup(Generic[_TSprite]):
     spritedict: dict[_TSprite, Optional[Union[FRect, Rect]]]
@@ -137,9 +137,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: _SpriteOrIterable[_TSprite]) -> None: ...
-    def remove(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
-    def has(self, *sprites: _SpriteOrIterable[_TSprite]) -> bool: ...
+    def add(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
+    def remove(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
+    def has(self, *sprites: _SpriteOrSprites[_TSprite]) -> bool: ...
     def update(self, *args: Any, **kwargs: Any) -> None: ...
     def draw(
         self, surface: Surface, bgd: Optional[Surface] = None, special_flags: int = 0
@@ -152,7 +152,7 @@ class AbstractGroup(Generic[_TSprite]):
     def empty(self) -> None: ...
 
 class Group(AbstractGroup[_TSprite]):
-    def __init__(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
+    def __init__(self, *sprites: _SpriteOrSprites[_TSprite]) -> None: ...
 
 # these are aliased in the code too
 @deprecated("Use `pygame.sprite.Group` instead")
@@ -167,10 +167,8 @@ class RenderUpdates(Group[_TSprite]): ...
 class OrderedUpdates(RenderUpdates[_TSprite]): ...
 
 class LayeredUpdates(AbstractGroup[_TSprite]):
-    def __init__(
-        self, *sprites: _SpriteOrIterable[_TSprite], **kwargs: Any
-    ) -> None: ...
-    def add(self, *sprites: _SpriteOrIterable[_TSprite], **kwargs: Any) -> None: ...
+    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]: ...