Merge branch 'version-3.1' into oauth_as_package

Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini

1 files changed, 4 insertions, 4 deletions

diff --git a/rest_framework/utils/html.py b/rest_framework/utils/html.py
index edc591e9..d773952d 100644
--- a/rest_framework/utils/html.py
+++ b/rest_framework/utils/html.py
@@ -2,6 +2,7 @@
 Helpers for dealing with HTML input.
 """
 import re
+from django.utils.datastructures import MultiValueDict
 
 
 def is_html_input(dictionary):
@@ -35,7 +36,7 @@ def parse_html_list(dictionary, prefix=''):
         '[0]foo': 'abc',
         '[0]bar': 'def',
         '[1]foo': 'hij',
-        '[2]bar': 'klm',
+        '[1]bar': 'klm',
     }
         -->
     [
@@ -43,7 +44,6 @@ def parse_html_list(dictionary, prefix=''):
         {'foo': 'hij', 'bar': 'klm'}
     ]
     """
-    Dict = type(dictionary)
     ret = {}
     regex = re.compile(r'^%s\[([0-9]+)\](.*)$' % re.escape(prefix))
     for field, value in dictionary.items():
@@ -57,7 +57,7 @@ def parse_html_list(dictionary, prefix=''):
         elif isinstance(ret.get(index), dict):
             ret[index][key] = value
         else:
-            ret[index] = Dict({key: value})
+            ret[index] = MultiValueDict({key: [value]})
     return [ret[item] for item in sorted(ret.keys())]
 
 
@@ -72,7 +72,7 @@ def parse_html_dict(dictionary, prefix):
         -->
     {
         'profile': {
-            'username': 'example,
+            'username': 'example',
             'email': 'example@example.com'
         }
     }