From e7247ce3f6d8115a6bc191e5ef816e04da82aa25 Mon Sep 17 00:00:00 2001 From: Jason Emerick Date: Tue, 2 Apr 2013 14:22:49 -0400 Subject: [PATCH] model the encode_files data handling after encode_params --- requests/models.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/requests/models.py b/requests/models.py index 8249ce3..0860567 100644 --- a/requests/models.py +++ b/requests/models.py @@ -99,11 +99,13 @@ class RequestEncodingMixin(object): files = to_key_val_list(files or {}) 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))) + if isinstance(val, basestring) or not hasattr(val, '__iter__'): + val = [val] + for v in val: + if v is not None: + new_fields.append( + (field.encode('utf-8') if isinstance(field, str) else field, + v.encode('utf-8') if isinstance(v, str) else v)) for (k, v) in files: # support for explicit filename -- 2.34.1