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

Merge.

Browse source
This commit is contained in:
Griatch 2013-03-09 12:16:50 +01:00
commit 406800f254
8 changed files with 60 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/utils/utils.py
View file

@ -496,7 +496,7 @@ def uses_database(name="sqlite3"):
engine = settings.DATABASE_ENGINE
return engine == "django.db.backends.%s" % name
def delay(to_return, delay=2, callback=None):
def delay(delay=2, retval=None, callback=None):
"""
Delay the return of a value.
Inputs:
@ -508,7 +508,7 @@ def delay(to_return, delay=2, callback=None):
"""
d = defer.Deferred()
callb = callback or d.callback
reactor.callLater(delay, callb, to_return)
reactor.callLater(delay, callb, retval)
return d
_FROM_MODEL_MAP = None