X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2F__init__.py;h=8c12ee2599c55ad8d58dc782c39b9640e7eea511;hp=2f1bed5924c74f2367217b226041dae6cff70809;hb=8a903d4a3899982b281ca33ee9c131b2fd9ef04d;hpb=5210334c47e97988ea55543d60a6b24985ebd140 diff --git a/mudpy/__init__.py b/mudpy/__init__.py index 2f1bed5..8c12ee2 100644 --- a/mudpy/__init__.py +++ b/mudpy/__init__.py @@ -1,13 +1,19 @@ """Core modules package for the mudpy engine.""" -# Copyright (c) 2004-2015 Jeremy Stanley . Permission +# Copyright (c) 2004-2018 Jeremy Stanley . 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 sys 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).""" @@ -21,7 +27,7 @@ def load(): # attempt to reload the module, assuming it was probably imported # earlier try: - exec("imp.reload(%s)" % module) + exec("importlib.reload(%s)" % module) # must not have been, so import it now except NameError: @@ -29,5 +35,5 @@ def load(): # load the modules contained in this package -modules = ["data", "misc", "password", "telnet"] +modules = ["data", "misc", "password", "telnet", "version"] load()