summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2007-07-22 03:12:50 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2007-07-22 03:12:50 +0000
commit63cc023eea4faa0af570b548375666e48af15904 (patch)
treee309e9534a80e475054e15be0adf8deb9f32b444
parentd95e91b380a72cc2011ee48c7875517984e723c2 (diff)
Shortcut functions do not accept `QuerySet` objects, yet :)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/shortcuts/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/shortcuts/__init__.py b/django/shortcuts/__init__.py
index b95f503188..9d7120bc7a 100644
--- a/django/shortcuts/__init__.py
+++ b/django/shortcuts/__init__.py
@@ -21,7 +21,7 @@ def get_object_or_404(klass, *args, **kwargs):
Use get() to return an object, or raise a Http404 exception if the object
does not exist.
- klass may be a Model, Manager, or QuerySet object. All other passed
+ klass may be a Model or Manager object. All other passed
arguments and keyword arguments are used in the get() query.
Note: Like with get(), an AssertionError will be raised if more than one
@@ -42,7 +42,7 @@ def get_list_or_404(klass, *args, **kwargs):
Use filter() to return a list of objects, or raise a Http404 exception if
the list is empty.
- klass may be a Model, Manager, or QuerySet object. All other passed
+ klass may be a Model or Manager object. All other passed
arguments and keyword arguments are used in the filter() query.
"""
if isinstance(klass, Manager):