summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorDavid Smith <smithdc@gmail.com>2021-10-18 17:06:00 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-10-19 06:33:00 +0200
commit6aa917383faaa80e70c6a8a8bc0f52f088434a84 (patch)
tree266a920665a19e685cd1809e276b234f444e0b39 /django
parentc067a2b68fe2701608b34ac4a538e1f9dba0e9f2 (diff)
[4.0.x] Refs #32956 -- Changed docs to treat the acronym HTTP phonetically.
Backport of 69b0736fad1d1f0197409ca025b7bcdf5666ae62 from main
Diffstat (limited to 'django')
-rw-r--r--django/core/handlers/asgi.py2
-rw-r--r--django/shortcuts.py6
-rw-r--r--django/test/client.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/django/core/handlers/asgi.py b/django/core/handlers/asgi.py
index 2b8cc8b76e..9d84efc964 100644
--- a/django/core/handlers/asgi.py
+++ b/django/core/handlers/asgi.py
@@ -176,7 +176,7 @@ class ASGIHandler(base.BaseHandler):
await self.send_response(response, send)
async def read_body(self, receive):
- """Reads a HTTP body from an ASGI connection."""
+ """Reads an HTTP body from an ASGI connection."""
# Use the tempfile that auto rolls-over to a disk file as it fills up.
body_file = tempfile.SpooledTemporaryFile(max_size=settings.FILE_UPLOAD_MAX_MEMORY_SIZE, mode='w+b')
while True:
diff --git a/django/shortcuts.py b/django/shortcuts.py
index d810471640..9d213bc1ff 100644
--- a/django/shortcuts.py
+++ b/django/shortcuts.py
@@ -13,7 +13,7 @@ from django.utils.functional import Promise
def render(request, template_name, context=None, content_type=None, status=None, using=None):
"""
- Return a HttpResponse whose content is filled with the result of calling
+ Return an HttpResponse whose content is filled with the result of calling
django.template.loader.render_to_string() with the passed arguments.
"""
content = loader.render_to_string(template_name, context, request, using=using)
@@ -56,7 +56,7 @@ def _get_queryset(klass):
def get_object_or_404(klass, *args, **kwargs):
"""
- Use get() to return an object, or raise a Http404 exception if the object
+ Use get() to return an object, or raise an Http404 exception if the object
does not exist.
klass may be a Model, Manager, or QuerySet object. All other passed
@@ -80,7 +80,7 @@ def get_object_or_404(klass, *args, **kwargs):
def get_list_or_404(klass, *args, **kwargs):
"""
- Use filter() to return a list of objects, or raise a Http404 exception if
+ Use filter() to return a list of objects, or raise an Http404 exception if
the list is empty.
klass may be a Model, Manager, or QuerySet object. All other passed
diff --git a/django/test/client.py b/django/test/client.py
index c65e07ce7e..560f994876 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -117,7 +117,7 @@ def conditional_content_removal(request, response):
class ClientHandler(BaseHandler):
"""
- A HTTP Handler that can be used for testing purposes. Use the WSGI
+ An HTTP Handler that can be used for testing purposes. Use the WSGI
interface to compose requests, but return the raw HttpResponse object with
the originating WSGIRequest attached to its ``wsgi_request`` attribute.
"""