summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-11-18 12:09:20 -0500
committerTim Graham <timograham@gmail.com>2015-01-17 08:13:36 -0500
commit37b7776a015102e97b9bdd64d88c732883ff9989 (patch)
treedf131155304b1904931ba3d15663f610391f1057 /django/forms/widgets.py
parent75f107b8842dfc890ddd65262bd09ca87c3a15be (diff)
Removed django.utils.datastructures.MergeDict per deprecation timeline; refs #18659.
Diffstat (limited to 'django/forms/widgets.py')
-rw-r--r--django/forms/widgets.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index de75b35932..b0743b4778 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -9,7 +9,7 @@ from itertools import chain
from django.conf import settings
from django.forms.utils import flatatt, to_current_timezone
-from django.utils.datastructures import MultiValueDict, MergeDict
+from django.utils.datastructures import MultiValueDict
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.html import conditional_escape, format_html
from django.utils.translation import ugettext_lazy
@@ -319,7 +319,7 @@ class MultipleHiddenInput(HiddenInput):
return mark_safe('\n'.join(inputs))
def value_from_datadict(self, data, files, name):
- if isinstance(data, (MultiValueDict, MergeDict)):
+ if isinstance(data, MultiValueDict):
return data.getlist(name)
return data.get(name, None)
@@ -587,7 +587,7 @@ class SelectMultiple(Select):
return mark_safe('\n'.join(output))
def value_from_datadict(self, data, files, name):
- if isinstance(data, (MultiValueDict, MergeDict)):
+ if isinstance(data, MultiValueDict):
return data.getlist(name)
return data.get(name, None)