summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorBouke Haarsma <bouke@webatoom.nl>2013-10-15 22:36:49 +0200
committerTim Graham <timograham@gmail.com>2013-10-17 09:42:28 -0400
commit2fb5a51fa3ac276efc7121ec9de91f092a986104 (patch)
tree77f8d7072b079cb9cddb1e8e05bb613681705f7b /django/utils
parent98788d3c3af9f6cce2b94c276d17726f46608b08 (diff)
Fixed #18659 -- Deprecated request.REQUEST and MergeDict
Thanks Aymeric Augustin for the suggestion.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/datastructures.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index 2f60c29cb0..fe0fc164e9 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -12,6 +12,8 @@ class MergeDict(object):
first occurrence will be used.
"""
def __init__(self, *dicts):
+ warnings.warn('`MergeDict` is deprecated, use `dict.update()` '
+ 'instead.', PendingDeprecationWarning, 2)
self.dicts = dicts
def __bool__(self):