final cleanup on part 8

Author: nuzcraft

Tests/test_input_handlers.py

@@ -14,7 +14,6 @@
 )
 
 from actions import (
-    EscapeAction,
     BumpAction,
     WaitAction,
     PickupAction,
@@ -535,8 +534,8 @@ def test_ev_keydown_escape(self):
         event_handler = MainGameEventHandler(engine=eng)
         event = tcod.event.KeyDown(
             scancode=tcod.event.Scancode.ESCAPE, sym=tcod.event.K_ESCAPE, mod=tcod.event.Modifier.NONE)
-        action = event_handler.dispatch(event)
-        self.assertIsInstance(action, EscapeAction)
+        with self.assertRaises(SystemExit):
+            action = event_handler.dispatch(event)
 
     def test_ev_keydown_v(self):
         '''

entity.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import copy
-from typing import Optional, Tuple, Type, TypeVar, TYPE_CHECKING
+from typing import Optional, Tuple, Type, TypeVar, TYPE_CHECKING, Union
 
 from render_order import RenderOrder
 
@@ -19,7 +19,7 @@ class Entity:
     '''
     A generic object to represent players, enemies, items, etc.
     '''
-    parent: GameMap
+    parent: Union[GameMap, Inventory]
 
     def __init__(
         self,
@@ -112,6 +112,7 @@ def is_alive(self) -> bool:
         """
         return bool(self.ai)
 
+
 class Item(Entity):
     def __init__(
         self,

input_handlers.py

@@ -7,7 +7,6 @@
 import actions
 from actions import (
     Action,
-    EscapeAction,
     BumpAction,
     PickupAction,
     WaitAction,
@@ -109,7 +108,7 @@ def ev_keydown(self, event: tcod.event.KeyDown) -> Optional[Action]:
             action = WaitAction(player)
 
         elif key == tcod.event.K_ESCAPE:
-            action = EscapeAction(player)
+            raise SystemExit()
 
         elif key == tcod.event.K_v:
             self.engine.event_handler = HistoryViewer(self.engine)