Change ordering of data + params back.

Fixes #795
This commit is contained in:
Ian Cordasco
2012-08-19 15:48:12 -04:00
parent b130b98086
commit f48c78c9ee
+7 -6
View File
@@ -352,6 +352,13 @@ class Request(object):
fields = to_key_val_list(self.data)
files = to_key_val_list(files)
for field, val in fields:
if isinstance(val, list):
for v in val:
new_fields.append((k, str(v)))
else:
new_fields.append((field, str(val)))
for (k, v) in files:
# support for explicit filename
if isinstance(v, (tuple, list)):
@@ -365,12 +372,6 @@ class Request(object):
fp = BytesIO(fp)
new_fields.append((k, (fn, fp.read())))
for field, val in fields:
if isinstance(val, list):
for v in val:
new_fields.append((k, str(v)))
else:
new_fields.append((field, str(val)))
body, content_type = encode_multipart_formdata(new_fields)
return body, content_type