Ticket #17235: t17235.patch

django/http/multipartparser.py

@@ -11 +11 @@
 
 from django.conf import settings
 from django.core.exceptions import SuspiciousOperation
-from django.utils.datastructures import MultiValueDict
+from django.utils.datastructures import ImmutableMultiValueDict
 from django.utils.encoding import force_text
 from django.utils import six
 from django.utils.text import unescape_entities
@@ -110 +110 @@
         # HTTP spec says that Content-Length >= 0 is valid
         # handling content-length == 0 before continuing
         if self._content_length == 0:
-            return QueryDict('', encoding=self._encoding), MultiValueDict()
+            return QueryDict('', mutable=True, encoding=self._encoding), ImmutableMultiValueDict()
 
         # See if the handler will want to take care of the parsing.
         # This allows overriding everything if somebody wants it.
@@ -125 +125 @@
 
         # Create the data structures to be used later.
         self._post = QueryDict('', mutable=True)
-        self._files = MultiValueDict()
+        self._files = ImmutableMultiValueDict(mutable=True)
 
         # Instantiate the parser and stream:
         stream = LazyStream(ChunkIter(self._input_data, self._chunk_size))
@@ -242 +242 @@
             if retval:
                 break
 
+        self._post._mutable = self._files._mutable = False
+
         return self._post, self._files
 
     def handle_file_complete(self, old_field_name, counters):

django/utils/datastructures.py

@@ -443 +443 @@
         return dict((key, self[key]) for key in self)
 
 
+class ImmutableMultiValueDict(MultiValueDict):
+    _mutbale = False
+
+    def __init__(self, key_to_list_mapping=(), mutable=False):
+        super(ImmutableMultiValueDict, self).__init__(key_to_list_mapping)
+        self._mutable = mutable
+
+    def _assert_mutable(self):
+        if not self._mutable:
+            raise AttributeError("This ImmutableMultiValueDict instance is immutable")
+
+    def __setitem__(self, key, value):
+        self._assert_mutable()
+        super(ImmutableMultiValueDict, self).__setitem__(key, value)
+
+    def __delitem__(self, key):
+        self._assert_mutable()
+        super(ImmutableMultiValueDict, self).__delitem__(key)
+    
+    def setlist(self, key, list_):
+        self._assert_mutable()
+        super(ImmutableMultiValueDict, self).setlist(key, list_)
+
+    def setlistdefault(self, key, default_list=None):
+        self._assert_mutable()
+        return super(ImmutableMultiValueDict, self).setlistdefault(key, default_list)
+
+    def appendlist(self, key, value):
+        self._assert_mutable()
+        super(ImmutableMultiValueDict, self).appendlist(key, value)
+
+    def pop(self, key, *args):
+        self._assert_mutable()
+        return super(ImmutableMultiValueDict, self).pop(key, *args)
+
+    def popitem(self):
+        self._assert_mutable()
+        return super(ImmutableMultiValueDict, self).popitem()
+
+    def clear(self):
+        self._assert_mutable()
+        super(ImmutableMultiValueDict, self).clear()
+
+    def setdefault(self, key, default=None):
+        self._assert_mutable()
+        return super(ImmutableMultiValueDict, self).setdefault(key, default)
+
+
 class ImmutableList(tuple):
     """
     A tuple-like object that raises useful errors when it is asked to mutate.