kennethreitz/requests3
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests3.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Kenneth Reitz
2012-08-21 00:43:27 +10:00
parent e5fc88ad37 2d5d6f99ab
commit 3514816d63
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/models.py
+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((field, 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