Commit 1d3d0407 authored by Marc Tamlyn's avatar Marc Tamlyn
Browse files

Merge pull request #1082 from hydrogen18/master

Fixed some documentation on the MultiPartParser
parents ee11d325 c278e56b
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ class MultiPartParser(object):
            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
        :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 @@ class MultiPartParser(object):
        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]