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

magic-removal: Merged to [2392] 

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-02-25 17:37:58 +00:00
parent cab51971ac
commit 52f84c0f63
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,10 @@ class QuerySet(object):
def get(self, *args, **kwargs): def get(self, *args, **kwargs):
"Performs the SELECT and returns a single object matching the given keyword arguments." "Performs the SELECT and returns a single object matching the given keyword arguments."
obj_list = list(self.filter(*args, **kwargs)) clone = self.filter(*args, **kwargs)
if not clone._order_by:
clone._order_by = ()
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 does not exist for %s" % (self.model._meta.object_name, 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) 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)

4
tests/othertests/defaultfilters.py
View File

@ -237,10 +237,6 @@ False
>>> timesince(datetime.datetime.now() - datetime.timedelta(1)) >>> timesince(datetime.datetime.now() - datetime.timedelta(1))
'1 day' '1 day'
# datetime.date compataibility with timesince
>>> timesince(datetime.date.today() - datetime.timedelta(1))
'1 day, 23 hours'
>>> default("val", "default") >>> default("val", "default")
'val' 'val'