mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-27 15:46:10 +00:00
Code Issues 32 Releases Wiki Activity

Removed django.utils.datastructures.MergeDict per deprecation timeline; refs #18659.

Browse Source
This commit is contained in:
Tim Graham
2014-11-18 12:09:20 -05:00
parent 75f107b884
commit 37b7776a01
4 changed files with 8 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
django/forms/widgets.py
View File

@@ -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)