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

Fixed a case of _EmptyCmdSet being named just EmptyCmdSet in call.

Browse source
This commit is contained in:
Griatch 2014-01-18 22:12:23 +01:00
parent 942a5aaf9a
commit 2db2141b90
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/commands/cmdsethandler.py
View file

@ -249,7 +249,7 @@ class CmdSetHandler(object):
self.cmdset_stack = [] self.cmdset_stack = []
for pos, path in enumerate(storage): for pos, path in enumerate(storage):
if pos == 0 and not path: if pos == 0 and not path:
self.cmdset_stack = [EmptyCmdSet(cmdsetobj=self.obj)] self.cmdset_stack = [_EmptyCmdSet(cmdsetobj=self.obj)]
elif path: elif path:
cmdset = self._import_cmdset(path) cmdset = self._import_cmdset(path)
if cmdset: if cmdset:
@ -415,9 +415,9 @@ class CmdSetHandler(object):
else: else:
storage = [""] storage = [""]
self.cmdset_storage = storage self.cmdset_storage = storage
self.cmdset_stack[0] = EmptyCmdSet(cmdsetobj=self.obj) self.cmdset_stack[0] = _EmptyCmdSet(cmdsetobj=self.obj)
else: else:
self.cmdset_stack = [EmptyCmdSet(cmdsetobj=self.obj)] self.cmdset_stack = [_EmptyCmdSet(cmdsetobj=self.obj)]
self.update() self.update()
def all(self): def all(self):

5
src/utils/utils.py
View file

@ -494,7 +494,10 @@ def delay(delay=2, retval=None, callback=None):
callback (func(retval)) - if given, this will be called with retval callback (func(retval)) - if given, this will be called with retval
after delay seconds after delay seconds
Returns: Returns:
deferred that will fire with to_return after delay seconds deferred that will fire with callback after delay seconds. Note that
if delay() is used in the commandhandler callback chain, the callback
chain can be defined directly in the command body and don't need to be
specified here.
""" """
d = defer.Deferred() d = defer.Deferred()
callb = callback or d.callback callb = callback or d.callback