summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-11 08:22:06 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-05-11 08:22:06 +0000
commitf9982c5c08f02699dddf097986a6b3bed54bf5a5 (patch)
treed8ad80af1aeae3bc0302534d4e609a6febd6b255
parent8562216c40e1a68b40eb9929daf125ae82cca035 (diff)
Fixed #4270 -- Don't permit deleting of items from an immutable QueryDict.
Thanks, Gary Wilson. git-svn-id: http://code.djangoproject.com/svn/django/trunk@5187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/http/__init__.py4
-rw-r--r--tests/regressiontests/httpwrappers/tests.py11
2 files changed, 15 insertions, 0 deletions
diff --git a/django/http/__init__.py b/django/http/__init__.py
index a0c51ff0da..74a4eff55c 100644
--- a/django/http/__init__.py
+++ b/django/http/__init__.py
@@ -91,6 +91,10 @@ class QueryDict(MultiValueDict):
self._assert_mutable()
MultiValueDict.__setitem__(self, key, value)
+ def __delitem__(self, key):
+ self._assert_mutable()
+ super(QueryDict, self).__delitem__(key)
+
def __copy__(self):
result = self.__class__('', mutable=True)
for key, value in dict.items(self):
diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py
index 29cb8385e0..c8016bc5bd 100644
--- a/tests/regressiontests/httpwrappers/tests.py
+++ b/tests/regressiontests/httpwrappers/tests.py
@@ -96,6 +96,12 @@ MultiValueDictKeyError: "Key 'foo' not found in <MultiValueDict: {}>"
>>> q['name']
'john'
+>>> del q['name']
+>>> 'name' in q
+False
+
+>>> q['name'] = 'john'
+
>>> q.get('foo', 'default')
'default'
@@ -367,6 +373,11 @@ AttributeError: This QueryDict instance is immutable
>>> q.urlencode()
'vote=yes&vote=no'
+>>> del q['vote']
+Traceback (most recent call last):
+...
+AttributeError: This QueryDict instance is immutable
+
"""
from django.http import QueryDict