Revert group's TypeVar to invariant

Author: nachomaiz

buildconfig/stubs/pygame/sprite.pyi

@@ -48,7 +48,7 @@ class _HasRadiusAndRect(_HasRect, Protocol):
     radius: float
 
 # non-generic Group, used in Sprite
-_Group = AbstractGroup[_SupportsSprite]
+_Group = AbstractGroup[Any]
 
 # protocol helps with structural subtyping for typevars in sprite group generics
 # and allows the use of any class with the required attributes and methods
@@ -118,35 +118,32 @@ class DirtySprite(Sprite, _SupportsDirtySprite):
     def _set_visible(self, val: int) -> None: ...
     def _get_visible(self) -> int: ...
 
-# covariant typevar bound to Sprite, _SupportsSprite Protocol ensures sprite
+# typevar bound to Sprite, _SupportsSprite Protocol ensures sprite
 # subclass passed to group has image and rect attributes
-# covariant is required for _Group to work with any AbstractGroup
-# otherwise Sprite.add/remove do not accept AbstractGroup as arguments
-_TSprite_co = TypeVar("_TSprite_co", bound=_SupportsSprite, covariant=True)
-_TDirtySprite_co = TypeVar(
-    "_TDirtySprite_co", bound=_SupportsDirtySprite, covariant=True
-)
+_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_co, Iterable[_SpriteOrIterable[_TSprite_co]]]
+_SpriteOrIterable = Union[_TSprite, Iterable[_SpriteOrIterable[_TSprite]]]
 
-class AbstractGroup(Generic[_TSprite_co]):
-    spritedict: dict[_TSprite_co, Optional[Union[FRect, Rect]]]
+class AbstractGroup(Generic[_TSprite]):
+    spritedict: dict[_TSprite, 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_co]: ...
+    def __iter__(self) -> Iterator[_TSprite]: ...
     def __bool__(self) -> bool: ...
     def __contains__(self, item: Any) -> bool: ...
-    def add_internal(self, sprite: _SupportsSprite, layer: None = None) -> None: ...
-    def remove_internal(self, sprite: _SupportsSprite) -> None: ...
-    def has_internal(self, sprite: _SupportsSprite) -> 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 copy(self) -> Self: ...
-    def sprites(self) -> list[_TSprite_co]: ...
-    def add(self, *sprites: _SpriteOrIterable[_TSprite_co]) -> None: ...
-    def remove(self, *sprites: _SpriteOrIterable[_TSprite_co]) -> None: ...
-    def has(self, *sprites: _SpriteOrIterable[_TSprite_co]) -> bool: ...
+    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 update(self, *args: Any, **kwargs: Any) -> None: ...
     def draw(
         self, surface: Surface, bgd: Optional[Surface] = None, special_flags: int = 0
@@ -158,41 +155,41 @@ class AbstractGroup(Generic[_TSprite_co]):
     ) -> None: ...
     def empty(self) -> None: ...
 
-class Group(AbstractGroup[_TSprite_co]):
-    def __init__(self, *sprites: _SpriteOrIterable[_TSprite_co]) -> None: ...
+class Group(AbstractGroup[_TSprite]):
+    def __init__(self, *sprites: _SpriteOrIterable[_TSprite]) -> None: ...
 
 # these are aliased in the code too
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderPlain(Group[_TSprite_co]): ...
+class RenderPlain(Group[_TSprite]): ...
 
 @deprecated("Use `pygame.sprite.Group` instead")
-class RenderClear(Group[_TSprite_co]): ...
+class RenderClear(Group[_TSprite]): ...
 
-class RenderUpdates(Group[_TSprite_co]): ...
+class RenderUpdates(Group[_TSprite]): ...
 
 @deprecated("Use `pygame.sprite.RenderUpdates` instead")
-class OrderedUpdates(RenderUpdates[_TSprite_co]): ...
+class OrderedUpdates(RenderUpdates[_TSprite]): ...
 
-class LayeredUpdates(AbstractGroup[_TSprite_co]):
+class LayeredUpdates(AbstractGroup[_TSprite]):
     def __init__(
-        self, *sprites: _SpriteOrIterable[_TSprite_co], **kwargs: Any
+        self, *sprites: _SpriteOrIterable[_TSprite], **kwargs: Any
     ) -> None: ...
-    def add(self, *sprites: _SpriteOrIterable[_TSprite_co], **kwargs: Any) -> None: ...
-    def get_sprites_at(self, pos: Point) -> list[_TSprite_co]: ...
-    def get_sprite(self, idx: int) -> _TSprite_co: ...
-    def remove_sprites_of_layer(self, layer_nr: int) -> list[_TSprite_co]: ...
+    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]: ...
     def layers(self) -> list[int]: ...
-    def change_layer(self, sprite: _SupportsSprite, new_layer: int) -> None: ...
-    def get_layer_of_sprite(self, sprite: _SupportsSprite) -> int: ...
+    def change_layer(self, sprite: _TSprite, new_layer: int) -> None: ...
+    def get_layer_of_sprite(self, sprite: _TSprite) -> int: ...
     def get_top_layer(self) -> int: ...
     def get_bottom_layer(self) -> int: ...
-    def move_to_front(self, sprite: _SupportsSprite) -> None: ...
-    def move_to_back(self, sprite: _SupportsSprite) -> None: ...
-    def get_top_sprite(self) -> _TSprite_co: ...
-    def get_sprites_from_layer(self, layer: int) -> list[_TSprite_co]: ...
+    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 switch_layer(self, layer1_nr: int, layer2_nr: int) -> None: ...
 
-class LayeredDirty(LayeredUpdates[_TDirtySprite_co]):
+class LayeredDirty(LayeredUpdates[_TDirtySprite]):
     def draw(
         self,
         surface: Surface,
@@ -210,9 +207,9 @@ class LayeredDirty(LayeredUpdates[_TDirtySprite_co]):
     )
     def set_timing_treshold(self, time_ms: SupportsFloat) -> None: ...
 
-class GroupSingle(AbstractGroup[_TSprite_co]):
-    sprite: _TSprite_co
-    def __init__(self, sprite: Optional[_TSprite_co] = None) -> None: ...
+class GroupSingle(AbstractGroup[_TSprite]):
+    sprite: _TSprite
+    def __init__(self, sprite: Optional[_TSprite] = None) -> None: ...
 
 # argument to collide_rect must have rect attribute
 def collide_rect(left: _HasRect, right: _HasRect) -> bool: ...
@@ -244,9 +241,7 @@ def collide_mask(
     left: _SupportsCollideMask, right: _SupportsCollideMask
 ) -> Optional[tuple[int, int]]: ...
 
-# typevars for sprite collide functions
-_TSprite = TypeVar("_TSprite", bound=_SupportsSprite)
-_TSprite2 = TypeVar("_TSprite2", bound=_SupportsSprite)
+# _HasRect typevar for sprite collide functions
 _THasRect = TypeVar("_THasRect", bound=_HasRect)
 
 def spritecollide(