summaryrefslogtreecommitdiff
path: root/django/http/utils.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-03 02:59:56 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-12-03 02:59:56 +0000
commit07ddd56872e70e76e13eb0b118c7b6503d5d821f (patch)
treee1e2eb0ab912b1b26246b4736ad114cc4541ad9c /django/http/utils.py
parent79653a414857e4f93918051843afbc1f7c9a7f99 (diff)
queryset-refactor: Merged from trunk up to [6856].
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/http/utils.py')
-rw-r--r--django/http/utils.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/http/utils.py b/django/http/utils.py
index d08a9e0237..f98ca93a37 100644
--- a/django/http/utils.py
+++ b/django/http/utils.py
@@ -5,7 +5,7 @@ Functions that modify an HTTP request or response in some way.
# This group of functions are run as part of the response handling, after
# everything else, including all response middleware. Think of them as
# "compulsory response middleware". Be careful about what goes here, because
-# it's a little fiddly to override this behaviour, so they should be truly
+# it's a little fiddly to override this behavior, so they should be truly
# universally applicable.
def fix_location_header(request, response):
@@ -13,7 +13,7 @@ def fix_location_header(request, response):
Ensures that we always use an absolute URI in any location header in the
response. This is required by RFC 2616, section 14.30.
- Code constructing response objects is free to insert relative paths and
+ Code constructing response objects is free to insert relative paths, as
this function converts them to absolute paths.
"""
if 'Location' in response and request.get_host():
@@ -31,4 +31,3 @@ def conditional_content_removal(request, response):
if request.method == 'HEAD':
response.content = ''
return response
-