projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve included files only once
[mudpy.git]
/
mudpy
/
__init__.py
diff --git
a/mudpy/__init__.py
b/mudpy/__init__.py
index
2f1bed5
..
8c12ee2
100644
(file)
--- a/
mudpy/__init__.py
+++ b/
mudpy/__init__.py
@@
-1,13
+1,19
@@
"""Core modules package for the mudpy engine."""
"""Core modules package for the mudpy engine."""
-# Copyright (c) 2004-201
5
Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-201
8
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.
# 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
sys
import mudpy # noqa (referenced via exec of string literal below)
import mudpy # noqa (referenced via exec of string literal below)
+if sys.version_info >= (3, 4):
+ import importlib # noqa (referenced via exec of string literal below)
+else:
+ # Python 3.3 lacks importlib.reload()
+ import imp as importlib # noqa (referenced via exec of string literal)
+
def load():
"""Import/reload some modules (be careful, as this can result in loops)."""
def load():
"""Import/reload some modules (be careful, as this can result in loops)."""
@@
-21,7
+27,7
@@
def load():
# attempt to reload the module, assuming it was probably imported
# earlier
try:
# attempt to reload the module, assuming it was probably imported
# earlier
try:
- exec("imp.reload(%s)" % module)
+ exec("imp
ortlib
.reload(%s)" % module)
# must not have been, so import it now
except NameError:
# must not have been, so import it now
except NameError:
@@
-29,5
+35,5
@@
def load():
# load the modules contained in this package
# load the modules contained in this package
-modules = ["data", "misc", "password", "telnet"]
+modules = ["data", "misc", "password", "telnet"
, "version"
]
load()
load()