From: Cory Benfield <lukasaoz@gmail.com>
Date: Sat, 12 Oct 2013 20:05:34 +0000 (+0100)
Subject: 'or content' does us no good.
X-Git-Tag: v2.0.1~13^2~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bea206018211ef77955dfeb1e982bd3530b1fe60;p=services%2Fpython-requests.git

'or content' does us no good.
---

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):