Remove _SupportsSprite and _SupportsDirtySprite protocols

Author: aatle

buildconfig/stubs/pygame/sprite.pyi

@@ -46,42 +46,7 @@ class _HasMaskAndRect(_HasRect, Protocol):
 # non-generic Group, used in Sprite
 _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
-class _SupportsSprite(_HasImageAndRect, Protocol):
-    @property
-    def image(self) -> Optional[Surface]: ...
-    @image.setter
-    def image(self, value: Optional[Surface]) -> None: ...
-    @property
-    def rect(self) -> Optional[Union[FRect, Rect]]: ...
-    @rect.setter
-    def rect(self, value: Optional[Union[FRect, Rect]]) -> None: ...
-    @property
-    def layer(self) -> int: ...
-    @layer.setter
-    def layer(self, value: int) -> 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: _GroupOrGroups[Any]) -> None: ...
-    def remove(self, *groups: _GroupOrGroups[Any]) -> None: ...
-    def kill(self) -> None: ...
-    def alive(self) -> bool: ...
-    def groups(self) -> list[_Group]: ...
-
-# also a protocol
-class _SupportsDirtySprite(_SupportsSprite, Protocol):
-    dirty: int
-    blendmode: int
-    source_rect: Union[FRect, Rect]
-    visible: int
-    _layer: int
-    def _set_visible(self, val: int) -> None: ...
-    def _get_visible(self) -> int: ...
-
-# concrete sprite implementation class
-class Sprite(_SupportsSprite):
+class Sprite:
     @property
     def image(self) -> Optional[Surface]: ...
     @image.setter
@@ -102,10 +67,9 @@ class Sprite(_SupportsSprite):
     def remove(self, *groups: _GroupOrGroups[Any]) -> None: ...
     def kill(self) -> None: ...
     def alive(self) -> bool: ...
-    def groups(self) -> list[AbstractGroup[_SupportsSprite]]: ...
+    def groups(self) -> list[AbstractGroup[Sprite]]: ...
 
-# concrete dirty sprite implementation class
-class DirtySprite(Sprite, _SupportsDirtySprite):
+class DirtySprite(Sprite):
     dirty: int
     blendmode: int
     source_rect: Union[FRect, Rect]
@@ -114,11 +78,9 @@ class DirtySprite(Sprite, _SupportsDirtySprite):
     def _set_visible(self, val: int) -> None: ...
     def _get_visible(self) -> int: ...
 
-# typevar bound to Sprite, _SupportsSprite Protocol ensures sprite
-# subclass passed to group has image and rect attributes
-_TSprite = TypeVar("_TSprite", bound=_SupportsSprite)
-_TSprite2 = TypeVar("_TSprite2", bound=_SupportsSprite)
-_TDirtySprite = TypeVar("_TDirtySprite", bound=_SupportsDirtySprite)
+_TSprite = TypeVar("_TSprite", bound=Sprite)
+_TSprite2 = TypeVar("_TSprite2", bound=Sprite)
+_TDirtySprite = TypeVar("_TDirtySprite", bound=DirtySprite)
 
 _GroupOrGroups = Union[AbstractGroup[_TSprite], Iterable[_GroupOrGroups[_TSprite]]]
 _SpriteOrSprites = Union[_TSprite, Iterable[_SpriteOrSprites[_TSprite]]]