From bea206018211ef77955dfeb1e982bd3530b1fe60 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Sat, 12 Oct 2013 21:05:34 +0100 Subject: [PATCH] 'or content' does us no good. --- requests/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requests/models.py b/requests/models.py index 0579b28..087f802 100644 --- a/requests/models.py +++ b/requests/models.py @@ -136,7 +136,7 @@ class RequestEncodingMixin(object): if isinstance(fp, bytes): fp = BytesIO(fp) - rf = RequestField(name=k, data=fp.read(), + rf = RequestField(name=k, data=fp.read(), filename=fn, headers=fh) rf.make_multipart(content_type=ft) new_fields.append(rf) @@ -690,7 +690,7 @@ class Response(object): encoding = guess_json_utf(self.content) if encoding is not None: return json.loads(self.content.decode(encoding), **kwargs) - return json.loads(self.text or self.content, **kwargs) + return json.loads(self.text, **kwargs) @property def links(self): -- 2.34.1