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

Fixed the loading of the menu_login contrib, doing some cleanup in the error reporting at the same time. Also added evennia to the search path for cmdsets and typeclasses so that one can give the path to e.g contrib when loading.

Browse source
This commit is contained in:
Griatch 2015-05-17 00:49:41 +02:00
parent e37079aa5b
commit 64c6d06d0f
4 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/cmdparser.py
View file

@ -66,7 +66,7 @@ def cmdparser(raw_string, cmdset, caller, match_index=None):
return (cmdname, args, cmdobj, cmdlen, mratio)
if not raw_string:
return None
return []
matches = []

10
evennia/commands/cmdsethandler.py
View file

@ -119,7 +119,6 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
#print "importing %s: _CACHED_CMDSETS=%s" % (python_path, _CACHED_CMDSETS)
wanted_cache_key = python_path
cmdsetclass = _CACHED_CMDSETS.get(wanted_cache_key, None)
errstring = ""
if not cmdsetclass:
#print "cmdset '%s' not in cache. Reloading %s on %s." % (wanted_cache_key, python_path, cmdsetobj)
# Not in cache. Reload from disk.
@ -130,21 +129,22 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
#instantiate the cmdset (and catch its errors)
if callable(cmdsetclass):
cmdsetclass = cmdsetclass(cmdsetobj)
errstring = ""
return cmdsetclass
except ImportError, e:
logger.log_trace()
#logger.log_trace()
errstring += _("Error loading cmdset {path}: {error}")
errstring = errstring.format(path=python_path, error=e)
except KeyError:
logger.log_trace()
#logger.log_trace()
errstring += _("Error in loading cmdset: No cmdset class '{classname}' in {path}.")
errstring = errstring.format(classname=classname, path=python_path)
except SyntaxError, e:
logger.log_trace()
#logger.log_trace()
errstring += _("SyntaxError encountered when loading cmdset '{path}': {error}.")
errstring = errstring.format(path=python_path, error=e)
except Exception, e:
logger.log_trace()
#logger.log_trace()
errstring += _("Compile/Run error when loading cmdset '{path}': {error}.")
errstring = errstring.format(path=python_path, error=e)