Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1082 from hydrogen18/master

Fixed some documentation on the MultiPartParser
  • Loading branch information...
commit 1d3d04070e67c952170075cabcadcafc71c87213 2 parents ee11d32 + c278e56
@mjtamlyn mjtamlyn authored
Showing with 6 additions and 5 deletions.
  1. +6 −5 django/http/multipartparser.py
View
11 django/http/multipartparser.py
@@ -48,9 +48,9 @@ def __init__(self, META, input_data, upload_handlers, encoding=None):
The standard ``META`` dictionary in Django request objects.
:input_data:
The raw post data, as a file-like object.
- :upload_handler:
- An UploadHandler instance that performs operations on the uploaded
- data.
+ :upload_handlers:
+ A list of UploadHandler instances that perform operations on the uploaded
+ data.
:encoding:
The encoding with which to treat the incoming data.
"""
@@ -113,14 +113,15 @@ def parse(self):
if self._content_length == 0:
return QueryDict('', encoding=self._encoding), MultiValueDict()
- # See if the handler will want to take care of the parsing.
- # This allows overriding everything if somebody wants it.
+ # See if any of the handlers take care of the parsing.
+ # This allows overriding everything if need be.
for handler in handlers:
result = handler.handle_raw_input(self._input_data,
self._meta,
self._content_length,
self._boundary,
encoding)
+ #Check to see if it was handled
if result is not None:
return result[0], result[1]
Please sign in to comment.
Something went wrong with that request. Please try again.