From bf499a80de4a0a6f0ab6a47caa0fbc5e8d03cc03 Mon Sep 17 00:00:00 2001 From: Rolando Espinoza La fuente Date: Wed, 16 Nov 2011 00:03:19 -0400 Subject: [PATCH 1/2] added support for explicit filenames in `files` parameter. files = { "files[]": ("myfile", open("foo")), } --- requests/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index 97237e77..75b98568 100644 --- a/requests/models.py +++ b/requests/models.py @@ -371,7 +371,13 @@ class Request(object): fields = dict(self.data) for (k, v) in self.files.items(): - fields.update({k: (guess_filename(k) or k, v.read())}) + # support for explicit filename + if isinstance(v, (tuple, list)): + fn, fp = v + else: + fn = guess_filename(v) or k + fp = v + fields.update({k: (fn, fp.read())}) (body, content_type) = encode_multipart_formdata(fields) else: From 89241c525ea7bef5e3efdce2837e2b82f8754848 Mon Sep 17 00:00:00 2001 From: Rolando Espinoza La fuente Date: Wed, 16 Nov 2011 00:04:48 -0400 Subject: [PATCH 2/2] use ";" instead "\r\n" as separator for cookies as is better supported in odd web servers. --- requests/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/models.py b/requests/models.py index 75b98568..486a7883 100644 --- a/requests/models.py +++ b/requests/models.py @@ -431,7 +431,7 @@ class Request(object): c[k] = v # Turn it into a header. - cookie_header = c.output(header='').strip() + cookie_header = c.output(header='', sep='; ').strip() # Attach Cookie header to request. self.headers['Cookie'] = cookie_header