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

diff --git a/lib/mudpy/__init__.py b/lib/mudpy/__init__.py
index f6d3fc8..d04f1b4 100644
--- a/lib/mudpy/__init__.py
+++ b/lib/mudpy/__init__.py
@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 """Core modules package for the mudpy engine."""
 
-# Copyright (c) 2004-2011 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():
     """Import/reload some modules (be careful, as this can result in loops)."""
@@ -18,11 +22,11 @@ def load():
         # attempt to reload the module, assuming it was probably imported
         # earlier
         try:
-            exec("reload(%s)" % module)
+            exec("imp.reload(%s)" % module)
 
         # must not have been, so import it now
         except NameError:
-            exec("import %s" % module)
+            exec("import mudpy.%s" % module)
 
 # load the modules contained in this package
 modules = ["data", "misc", "password", "telnet"]