summaryrefslogtreecommitdiff
path: root/django/http
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2014-03-02 15:25:53 +0100
committerTim Graham <timograham@gmail.com>2014-03-03 07:38:09 -0500
commit0d912258921a442c48d5787228db2db5af7e8fa5 (patch)
treef6826425de5bca2498c46e5242b870282a34eda2 /django/http
parent6acaa5238668593d6d854b28dbfa65e95796585c (diff)
Fixed many typos in comments and docstrings.
Thanks Piotr Kasprzyk for help with the patch.
Diffstat (limited to 'django/http')
-rw-r--r--django/http/multipartparser.py6
-rw-r--r--django/http/response.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/django/http/multipartparser.py b/django/http/multipartparser.py
index eecf6150d4..6d03f877a1 100644
--- a/django/http/multipartparser.py
+++ b/django/http/multipartparser.py
@@ -253,7 +253,7 @@ class MultiPartParser(object):
def handle_file_complete(self, old_field_name, counters):
"""
- Handle all the signalling that takes place when a file is complete.
+ Handle all the signaling that takes place when a file is complete.
"""
for i, handler in enumerate(self._upload_handlers):
file_obj = handler.file_complete(counters[i])
@@ -484,7 +484,7 @@ class BoundaryIter(six.Iterator):
self._done = True
return chunk[:end]
else:
- # make sure we dont treat a partial boundary (and
+ # make sure we don't treat a partial boundary (and
# its separators) as data
if not chunk[:-rollback]: # and len(chunk) >= (len(self._boundary) + 6):
# There's nothing left, we should just return and mark as done.
@@ -498,7 +498,7 @@ class BoundaryIter(six.Iterator):
"""
Finds a multipart boundary in data.
- Should no boundry exist in the data None is returned instead. Otherwise
+ Should no boundary exist in the data None is returned instead. Otherwise
a tuple containing the indices of the following are returned:
* the end of current encapsulation
diff --git a/django/http/response.py b/django/http/response.py
index 324f67c847..602e03284d 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -189,7 +189,7 @@ class HttpResponseBase(six.Iterator):
return self._headers[header.lower()][1]
def __getstate__(self):
- # SimpleCookie is not pickeable with pickle.HIGHEST_PROTOCOL, so we
+ # SimpleCookie is not pickleable with pickle.HIGHEST_PROTOCOL, so we
# serialize to a string instead
state = self.__dict__.copy()
state['cookies'] = str(state['cookies'])
@@ -274,7 +274,7 @@ class HttpResponseBase(six.Iterator):
return bytes(value)
# Handle string types -- we can't rely on force_bytes here because:
- # - under Python 3 it attemps str conversion first
+ # - under Python 3 it attempts str conversion first
# - when self._charset != 'utf-8' it re-encodes the content
if isinstance(value, bytes):
return bytes(value)