Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a trivial check for ImportErrors inside a module imported by utils.mod_import. Resolves Issue 319.

Browse source
This commit is contained in:
Griatch 2012-11-03 20:47:55 +01:00
parent 8966f03713
commit 5b8906e08a
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/utils/utils.py
View file

@ -7,7 +7,7 @@ be of use when designing your own game.
""" """
import os, sys, imp, types, math, re import os, sys, imp, types, math, re
import textwrap, datetime, random import textwrap, datetime, random, traceback, inspect
from inspect import ismodule from inspect import ismodule
from collections import defaultdict from collections import defaultdict
from twisted.internet import threads, defer, reactor from twisted.internet import threads, defer, reactor
@ -804,11 +804,10 @@ def mod_import(module):
from within an exception. errmsg is optional and from within an exception. errmsg is optional and
adds an extra line with added info. adds an extra line with added info.
""" """
from traceback import format_exc
from twisted.python import log from twisted.python import log
print errmsg print errmsg
tracestring = format_exc() tracestring = traceback.format_exc()
if tracestring: if tracestring:
for line in tracestring.splitlines(): for line in tracestring.splitlines():
log.msg('[::] %s' % line) log.msg('[::] %s' % line)
@ -830,9 +829,14 @@ def mod_import(module):
# first try to import as a python path # first try to import as a python path
try: try:
mod = __import__(module, fromlist=["None"]) mod = __import__(module, fromlist=["None"])
except ImportError: except ImportError, ex:
# check just where the ImportError happened (it could have been an erroneous
# import inside the module as well). This is the trivial way to do it ...
if str(ex) != "Import by filename is not supported.":
#log_trace("ImportError inside module '%s': '%s'" % (module, str(ex)))
raise
# try absolute path import instead # error in this module. Try absolute path import instead
if not os.path.isabs(module): if not os.path.isabs(module):
module = os.path.abspath(module) module = os.path.abspath(module)