Skip to content

Commit da6b386

Browse files
Changed docstring additions from [5744] to use active verbs ('returns' instead of 'return')
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent 3b78695 commit da6b386

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

django/shortcuts/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
def render_to_response(*args, **kwargs):
1313
"""
14-
Return a HttpResponse whose content is filled with the result of calling
14+
Returns a HttpResponse whose content is filled with the result of calling
1515
django.template.loader.render_to_string() with the passed arguments.
1616
"""
1717
return HttpResponse(loader.render_to_string(*args, **kwargs))
1818
load_and_render = render_to_response # For backwards compatibility.
1919

2020
def _get_queryset(klass):
2121
"""
22-
Return a QuerySet from a Model, Manager, or QuerySet. Created to make
22+
Returns a QuerySet from a Model, Manager, or QuerySet. Created to make
2323
get_object_or_404 and get_list_or_404 more DRY.
2424
"""
2525
if isinstance(klass, QuerySet):
@@ -32,10 +32,10 @@ def _get_queryset(klass):
3232

3333
def get_object_or_404(klass, *args, **kwargs):
3434
"""
35-
Use get() to return an object, or raise a Http404 exception if the object
35+
Uses get() to return an object, or raises a Http404 exception if the object
3636
does not exist.
3737
38-
klass may be a Model, Manager, or QuerySet object. All other passed
38+
klass may be a Model, Manager, or QuerySet object. All other passed
3939
arguments and keyword arguments are used in the get() query.
4040
4141
Note: Like with get(), an AssertionError will be raised if more than one
@@ -49,10 +49,10 @@ def get_object_or_404(klass, *args, **kwargs):
4949

5050
def get_list_or_404(klass, *args, **kwargs):
5151
"""
52-
Use filter() to return a list of objects, or raise a Http404 exception if
52+
Uses filter() to return a list of objects, or raise a Http404 exception if
5353
the list is empty.
5454
55-
klass may be a Model, Manager, or QuerySet object. All other passed
55+
klass may be a Model, Manager, or QuerySet object. All other passed
5656
arguments and keyword arguments are used in the filter() query.
5757
"""
5858
queryset = _get_queryset(klass)

0 commit comments

Comments
 (0)