Make _move_sprite() generic

Author: cspotcode

arcade/physics_engines.py

@@ -4,12 +4,13 @@
 # pylint: disable=too-many-arguments, too-many-locals, too-few-public-methods
 
 import math
-from typing import Iterable, List, Optional, Union
+from typing import Iterable, List, Optional, Union, cast
 
 from arcade import (
     BasicSprite,
     Sprite,
     SpriteList,
+    SpriteType,
     check_for_collision,
     check_for_collision_with_lists
 )
@@ -54,7 +55,7 @@ def _circular_check(player: Sprite, walls: List[SpriteList]):
         vary *= 2
 
 
-def _move_sprite(moving_sprite: Sprite, walls: List[SpriteList], ramp_up: bool) -> List[Union[Sprite, BasicSprite]]:
+def _move_sprite(moving_sprite: Sprite, walls: List[SpriteList[SpriteType]], ramp_up: bool) -> List[SpriteType]:
 
     # See if we are starting this turn with a sprite already colliding with us.
     if len(check_for_collision_with_lists(moving_sprite, walls)) > 0:
@@ -231,12 +232,12 @@ class PhysicsEngineSimple:
         This can be one or multiple spritelists.
     """
 
-    def __init__(self, player_sprite: Sprite, walls: Union[SpriteList, Iterable[SpriteList]]):
+    def __init__(self, player_sprite: Sprite, walls: Union[SpriteList[BasicSprite], Iterable[SpriteList[BasicSprite]]]):
         assert isinstance(player_sprite, Sprite)
 
         if walls:
             if isinstance(walls, SpriteList):
-                self.walls = [walls]
+                self.walls = [cast(SpriteList[BasicSprite], walls)]
             else:
                 self.walls = list(walls)
         else:

arcade/sprite_list/collision.py

@@ -59,7 +59,7 @@ def get_closest_sprite(
     return sprite_list[min_pos], min_distance
 
 
-def check_for_collision(sprite1: SpriteType, sprite2: SpriteType) -> bool:
+def check_for_collision(sprite1: BasicSprite, sprite2: BasicSprite) -> bool:
     """
     Check for a collision between two sprites.