From f48c78c9eebde590dfadc7f0d89e1de1ed9f85b3 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sun, 19 Aug 2012 15:48:12 -0400 Subject: [PATCH 1/2] Change ordering of data + params back. Fixes #795 --- requests/models.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/requests/models.py b/requests/models.py index cc8ab083..d20f8f17 100644 --- a/requests/models.py +++ b/requests/models.py @@ -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 From 6d418d91324c77c6b131abcdbe7a82095ea074dc Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Sun, 19 Aug 2012 16:02:29 -0400 Subject: [PATCH 2/2] Fix a fairly critical error on my part. --- requests/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index d20f8f17..02713ddd 100644 --- a/requests/models.py +++ b/requests/models.py @@ -355,7 +355,7 @@ class Request(object): for field, val in fields: if isinstance(val, list): for v in val: - new_fields.append((k, str(v))) + new_fields.append((field, str(v))) else: new_fields.append((field, str(val)))