1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Fixed #26905 -- Allowed using MultiValueDict-like objects as form data.

This commit is contained in:
Marcin Nowak
2016-07-18 20:04:35 +02:00
committed by Tim Graham
parent 2b759c94c5
commit 74bb013cc1
2 changed files with 27 additions and 7 deletions

View File

@@ -13,7 +13,6 @@ from django.conf import settings
from django.forms.utils import flatatt, to_current_timezone
from django.templatetags.static import static
from django.utils import datetime_safe, formats, six
from django.utils.datastructures import MultiValueDict
from django.utils.dates import MONTHS
from django.utils.deprecation import (
RemovedInDjango20Warning, RenameMethodsBase,
@@ -331,9 +330,11 @@ class MultipleHiddenInput(HiddenInput):
return mark_safe('\n'.join(inputs))
def value_from_datadict(self, data, files, name):
if isinstance(data, MultiValueDict):
return data.getlist(name)
return data.get(name)
try:
getter = data.getlist
except AttributeError:
getter = data.get
return getter(name)
class FileInput(Input):
@@ -602,9 +603,11 @@ class SelectMultiple(Select):
return mark_safe('\n'.join(output))
def value_from_datadict(self, data, files, name):
if isinstance(data, MultiValueDict):
return data.getlist(name)
return data.get(name)
try:
getter = data.getlist
except AttributeError:
getter = data.get
return getter(name)
@html_safe