From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 30 Jan 2013 00:28:34 +0000 (+0000)
Subject: The reload function is in the imp module
X-Git-Tag: 0.0.1~270
X-Git-Url: https://mudpy.org/gitweb?a=commitdiff_plain;h=d1bb931c57c032deaf555bbf0df85cfe4a787c70;p=mudpy.git

The reload function is in the imp module

* bin/mudpy
* lib/mudpy/__init__.py: For Py3K compatibility, only invoke the reload
function from the imp module rather than the global built-in namespace.
---

diff --git a/bin/mudpy b/bin/mudpy
index b1071e3..e946462 100755
--- a/bin/mudpy
+++ b/bin/mudpy
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 """Skeletal executable 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.
 
@@ -10,6 +10,7 @@
 import os.path
 import sys
 sys.path.append( os.path.realpath("lib") )
+import imp
 import mudpy
 
 # start it up
@@ -21,7 +22,7 @@ while not mudpy.misc.universe.terminate_flag or mudpy.misc.universe.userlist:
 
     # the world was flagged for a reload of all code/data
     if mudpy.misc.universe.reload_flag:
-        reload(mudpy)
+        imp.reload(mudpy)
         mudpy.misc.reload_data()
         mudpy.misc.universe.reload_flag = False
 
diff --git a/lib/mudpy/__init__.py b/lib/mudpy/__init__.py
index 8e077f7..4224b2f 100644
--- a/lib/mudpy/__init__.py
+++ b/lib/mudpy/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Core modules package for the mudpy engine."""
 
-# Copyright (c) 2004-2012 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.
 
@@ -9,6 +9,8 @@
 def load():
     """Import/reload some modules (be careful, as this can result in loops)."""
 
+    import imp
+
     # pick up the modules list from this package
     global modules
 
@@ -18,7 +20,7 @@ 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: