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

Fixed a bug in obj_from_dbid (obj_from_dbref). Resolves #980.

Browse source
This commit is contained in:
Griatch 2016-06-01 23:09:33 +02:00
parent 410d04456c
commit 730d08e790
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/utils/utils.py
View file

@ -462,12 +462,12 @@ def dbref(dbref, reqhash=True):
return dbref if isinstance(dbref, int) else None
def dbid_to_obj(inp, objclass, raise_errors=True):
def dbref_to_obj(inp, objclass, raise_errors=True):
"""
Convert a #dbid to a valid object.
Convert a #dbref to a valid object.
Args:
inp (str or int): A valid dbref.
inp (str or int): A valid #dbref.
objclass (class): A valid django model to filter against.
raise_errors (bool, optional): Whether to raise errors
or return `None` on errors.
@ -486,19 +486,22 @@ def dbid_to_obj(inp, objclass, raise_errors=True):
# we only convert #dbrefs
return inp
try:
if int(inp) < 0:
if dbid < 0:
return None
except ValueError:
return None
# if we get to this point, inp is an integer dbref; get the matching object
try:
return objclass.objects.get(id=inp)
return objclass.objects.get(id=dbid)
except Exception:
if raise_errors:
raise
return inp
# legacy alias
dbid_to_obj = dbref_to_obj
def to_unicode(obj, encoding='utf-8', force_string=False):
"""