test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed QuerySet __getitem__ corner case so that it throws exceptions consistently 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2006-05-06 12:15:19 +00:00
parent 862328a98f
commit 0b73811e26
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/query.py
View File

@ -130,7 +130,10 @@ class QuerySet(object):
else: else:
return self._clone(_offset=k, _limit=1).get() return self._clone(_offset=k, _limit=1).get()
else: else:
try:
return self._result_cache[k] return self._result_cache[k]
except IndexError:
raise self.model.DoesNotExist, "%s matching query does not exist." % self.model._meta.object_name
def __and__(self, other): def __and__(self, other):
combined = self._combine(other) combined = self._combine(other)
@ -189,7 +192,7 @@ class QuerySet(object):
clone._order_by = () clone._order_by = ()
obj_list = list(clone) obj_list = list(clone)
if len(obj_list) < 1: if len(obj_list) < 1:
raise self.model.DoesNotExist, "%s does not exist for %s" % (self.model._meta.object_name, kwargs) raise self.model.DoesNotExist, "%s matching query does not exist." % self.model._meta.object_name
assert len(obj_list) == 1, "get() returned more than one %s -- it returned %s! Lookup parameters were %s" % (self.model._meta.object_name, len(obj_list), kwargs) assert len(obj_list) == 1, "get() returned more than one %s -- it returned %s! Lookup parameters were %s" % (self.model._meta.object_name, len(obj_list), kwargs)
return obj_list[0] return obj_list[0]