X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;f=mudpy%2F__init__.py;h=216d03de91fc77ce09cc83438e8edc3c86c9e888;hb=5872d07f0ed969733b9c7e3e82f7c72ca6ef8cee;hp=5fdefe82db541de9953c7fbc1fce8e194d3b98e1;hpb=91f6b37e5fc36953cc1f3150695382d0822b0672;p=mudpy.git

diff --git a/mudpy/__init__.py b/mudpy/__init__.py
index 5fdefe8..216d03d 100644
--- a/mudpy/__init__.py
+++ b/mudpy/__init__.py
@@ -1,32 +1,42 @@
 """Core modules package for the mudpy engine."""
 
-# Copyright (c) 2004-2015 Jeremy Stanley <fungi@yuggoth.org>. Permission
-# to use, copy, modify, and distribute this software is granted under
-# terms provided in the LICENSE file distributed with this software.
+# Copyright (c) 2004-2022 mudpy authors. Permission to use, copy,
+# modify, and distribute this software is granted under terms
+# provided in the LICENSE file distributed with this software.
 
-import imp  # noqa (referenced via exec of string literal below)
+import importlib
 
-import mudpy  # noqa (referenced via exec of string literal below)
+import mudpy
 
 
 def load():
     """Import/reload some modules (be careful, as this can result in loops)."""
 
-    # pick up the modules list from this package
-    global modules
+    # dynamically build module list from package contents
+    modules = []
+    for module in mudpy.__spec__.loader.get_resource_reader().contents():
 
-    # iterate over the list of modules provided
+        if (
+                # make sure it's a module file, not a directory
+                module.endswith('.py')
+
+                # don't include this file, we're inside it
+                and module != '__init__.py'):
+
+            # trim off the .py file extension
+            modules.append(module[:-3])
+
+    # iterate over the list of module files included in the package
     for module in modules:
 
         # attempt to reload the module, assuming it was probably imported
         # earlier
         try:
-            exec("imp.reload(%s)" % module)
+            importlib.reload(getattr(mudpy, module))
 
         # must not have been, so import it now
-        except NameError:
-            exec("import mudpy.%s" % module)
+        except AttributeError:
+            importlib.import_module("mudpy.%s" % module)
+
 
-# load the modules contained in this package
-modules = ["data", "misc", "password", "telnet"]
 load()