summaryrefslogtreecommitdiff
path: root/tests/modeltests/get_object_or_404
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2007-12-03 17:37:33 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2007-12-03 17:37:33 +0000
commitc68f751f8c376a1dbcb51760e3b475392af7adba (patch)
tree06b672fe11a885e346c4a1b7c0594e2bbc93c34b /tests/modeltests/get_object_or_404
parent22aa9db4a22d848011775af7007d3c1f8772e056 (diff)
newforms-admin: Merged changes from trunk up to [6863].
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/modeltests/get_object_or_404')
-rw-r--r--tests/modeltests/get_object_or_404/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/modeltests/get_object_or_404/models.py
index bd800317d3..d9f276b024 100644
--- a/tests/modeltests/get_object_or_404/models.py
+++ b/tests/modeltests/get_object_or_404/models.py
@@ -78,7 +78,7 @@ Http404: No Article matches the given query.
>>> get_object_or_404(Author.objects.all())
Traceback (most recent call last):
...
-AssertionError: get() returned more than one Author -- it returned ...! Lookup parameters were {}
+MultipleObjectsReturned: get() returned more than one Author -- it returned ...! Lookup parameters were {}
# Using an EmptyQuerySet raises a Http404 error.
>>> get_object_or_404(Article.objects.none(), title__contains="Run")