kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

'or content' does us no good.

Browse Source
This commit is contained in:
Cory Benfield
2013-10-12 21:05:34 +01:00
parent 097121d214
commit bea2060182
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/models.py
+2 -2
View File
@@ -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):