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

Fixed a mis-call in create_object.

Browse source
This commit is contained in:
Griatch 2014-01-19 00:19:31 +01:00
parent f48fd8fa2c
commit 1cabcae771
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/create.py
View file

@ -51,7 +51,7 @@ _GA = object.__getattribute__
# Helper function # Helper function
def handle_dbref(inp, objclass=None, raise_errors=True): def handle_dbref(inp, objclass, raise_errors=True):
""" """
Convert a #dbid to a valid object of objclass. objclass Convert a #dbid to a valid object of objclass. objclass
should be a valid object class to filter against (objclass.filter ...) should be a valid object class to filter against (objclass.filter ...)
@ -70,7 +70,7 @@ def handle_dbref(inp, objclass=None, raise_errors=True):
# if we get to this point, inp is an integer dbref # if we get to this point, inp is an integer dbref
try: try:
return objclass.objects.get(id=inp) return objclass.objects.get(id=inp)
except _GA(objclass, "DoesNotExist"): except Exception:
if raise_errors: if raise_errors:
raise raise
return inp return inp
@ -177,7 +177,7 @@ def create_object(typeclass=None, key=None, location=None,
# we shouldn't need to handle dbref here (home handler should fix it), but some have # we shouldn't need to handle dbref here (home handler should fix it), but some have
# reported issues here (issue 446). # reported issues here (issue 446).
try: try:
new_object.home = handle_dbref(settings.CHARACTER_DEFAULT_HOME) if not nohome else None new_object.home = handle_dbref(settings.CHARACTER_DEFAULT_HOME, _ObjectDB) if not nohome else None
except _ObjectDB.DoesNotExist: except _ObjectDB.DoesNotExist:
raise _ObjectDB.DoesNotExist("CHARACTER_DEFAULT_HOME (= '%s') does not exist, or the setting is malformed." % raise _ObjectDB.DoesNotExist("CHARACTER_DEFAULT_HOME (= '%s') does not exist, or the setting is malformed." %
settings.CHARACTER_DEFAULT_HOME) settings.CHARACTER_DEFAULT_HOME)