# HG changeset patch
# User Julien Cristau <julien.cristau@logilab.fr>
# Date 1443692549 -7200
# Node ID 407385314c0da61bcd741976f69f81d5190f6e1e
# Parent  5318337e7128f3e6ae71a2d629737e41e26f66dc
[multipart] decode form data before calling parse_qs in python 3

parse_qs eats and returns 'str' on both python versions.

diff -r 5318337e7128 -r 407385314c0d multipart.py
--- a/multipart.py	Thu Oct 01 11:41:20 2015 +0200
+++ b/multipart.py	Thu Oct 01 11:42:29 2015 +0200
@@ -45,7 +45,7 @@
 except ImportError: # pragma: no cover (fallback for Python 2.5)
     from StringIO import StringIO as BytesIO
 
-from six import text_type
+from six import PY3, text_type
 from six.moves.urllib.parse import parse_qs
 
 ##############################################################################
@@ -396,14 +396,19 @@
                               'application/x-url-encoded'):
             mem_limit = kw.get('mem_limit', 2**20)
             if content_length > mem_limit:
-                raise MultipartError("Request to big. Increase MAXMEM.")
+                raise MultipartError("Request too big. Increase MAXMEM.")
             data = stream.read(mem_limit)
             if stream.read(1): # These is more that does not fit mem_limit
-                raise MultipartError("Request to big. Increase MAXMEM.")
+                raise MultipartError("Request too big. Increase MAXMEM.")
+            if PY3:
+                data = data.decode('ascii')
             data = parse_qs(data, keep_blank_values=True)
             for key, values in data.items():
                 for value in values:
-                    forms[key.decode(charset)] = value.decode(charset)
+                    if PY3:
+                        forms[key] = value
+                    else:
+                        forms[key.decode(charset)] = value.decode(charset)
         else:
             raise MultipartError("Unsupported content type.")
     except MultipartError: