Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-05 23:47:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some errors in channel loading.

Browse source
This commit is contained in:
Griatch 2014-12-25 18:58:11 +01:00
parent dd20740e73
commit 11449f3d62
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/utils/utils.py
View file

@ -933,24 +933,29 @@ def class_from_module(path, defaultpaths=None):
"""
cls = None
if defaultpaths:
paths = [path] + make_iter(defaultpaths) if defaultpaths else []
paths = [path] + ["%s.%s" % (dpath, path) for dpath in make_iter(defaultpaths)] if defaultpaths else []
else:
paths = [path]
for path in paths:
path, clsname = path.rsplit(".", 1)
for testpath in paths:
if "." in path:
testpath, clsname = testpath.rsplit(".", 1)
else:
testpath, clsname = ".", testpath
try:
mod = import_module(path)
mod = import_module(testpath)
except ImportError, ex:
# normally this is due to a not-found property
if not str(ex).startswith ("No module named %s" % path):
raise ex
if not str(ex).startswith("No module named"):
exc = sys.exc_info()
raise exc[1], None, exc[2]
try:
cls = getattr(mod, clsname)
break
except AttributeError, ex:
if not str(ex).startswith("Object 'module' has no attribute '%s'" % clsname):
raise ex
if not str(ex).startswith("'module' object has no attribute '%s'" % clsname):
exc = sys.exc_info()
raise exc[1], None, exc[2]
if not cls:
raise ImportError("Could not load typeclass '%s'." % path)
return cls