Fix Python 3.9 compatibility

SkyTemple · Jul 30, 2023 · 3695efe · 3695efe
1 parent b34a7be
commit 3695efe
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/skytemple/core/modules.py b/skytemple/core/modules.py
@@ -19,7 +19,7 @@
 
 import sys
 import logging
-from typing import TYPE_CHECKING, Type
+from typing import TYPE_CHECKING, Type, Iterable
 
 from typing import Dict
 
@@ -41,12 +41,18 @@ class Modules:
     @classmethod
     def load(cls):
         # Look up package entrypoints for modules
+        cls._modules = {}
         try:
+            modules: Iterable[importlib_metadata.EntryPoint]
+            if sys.version_info < (3, 10):
+                modules = importlib_metadata.entry_points()[MODULE_ENTRYPOINT_KEY]
+            else:
+                modules = importlib_metadata.entry_points().select(group=MODULE_ENTRYPOINT_KEY)
             cls._modules = {
                 entry_point.name:
-                    entry_point.load() for entry_point in importlib_metadata.entry_points().select(group=MODULE_ENTRYPOINT_KEY)
+                    entry_point.load() for entry_point in modules
             }
-        except BaseException as ex:
+        except Exception as ex:
             logger.warning("Failed loading modules.", exc_info=ex)
 
         if len(cls._modules) < 1: