X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=lib%2Fmudpy%2F__init__.py;h=d04f1b4a377654716b1e63e8cd42072b6256d3fa;hp=d4625281ff5b36766d434e58bff85b4b82e742bd;hb=ea945a289230d6d8f3010e9c9b8b5b1fd1f293db;hpb=0fca7fa3d5ac08111c8850555813d341d699797f

diff --git a/lib/mudpy/__init__.py b/lib/mudpy/__init__.py
index d462528..d04f1b4 100644
--- a/lib/mudpy/__init__.py
+++ b/lib/mudpy/__init__.py
@@ -1,25 +1,33 @@
 # -*- coding: utf-8 -*-
-u"""Core modules package for the mudpy engine."""
+"""Core modules package for the mudpy engine."""
 
-# Copyright (c) 2004-2010 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2013 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.
 
+import imp  # noqa (referenced via exec of string literal below)
+
+import mudpy  # noqa (referenced via exec of string literal below)
+
+
 def load():
-   u"""Import/reload some modules (be careful, as this can result in loops)."""
+    """Import/reload some modules (be careful, as this can result in loops)."""
 
-   # pick up the modules list from this package
-   global modules
+    # pick up the modules list from this package
+    global modules
 
-   # iterate over the list of modules provided
-   for module in modules:
+    # iterate over the list of modules provided
+    for module in modules:
 
-      # attempt to reload the module, assuming it was probably imported earlier
-      try: exec(u"reload(%s)" % module)
+        # attempt to reload the module, assuming it was probably imported
+        # earlier
+        try:
+            exec("imp.reload(%s)" % module)
 
-      # must not have been, so import it now
-      except NameError: exec(u"import %s" % module)
+        # must not have been, so import it now
+        except NameError:
+            exec("import mudpy.%s" % module)
 
 # load the modules contained in this package
-modules = [ u"misc", u"telnet" ]
+modules = ["data", "misc", "password", "telnet"]
 load()