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

Merge pull request #3607 from frankier/dont-swallow-attributeerror

Browse Source 
Remove error swallowing exception catching of AttributeError
This commit is contained in:
Ian Cordasco
2016-09-30 07:17:17 -05:00
committed by GitHub
parent 022e23c977 327512f5ef
commit 7322a09379
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/models.py
+6 -10
View File
@@ -747,18 +747,14 @@ class Response(object):
if self._content is False:
# Read the contents.
try:
if self._content_consumed:
raise RuntimeError(
'The content for this response was already consumed')
if self._content_consumed:
raise RuntimeError(
'The content for this response was already consumed')
if self.status_code == 0:
self._content = None
else:
self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
except AttributeError:
if self.status_code == 0:
self._content = None
else:
self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
self._content_consumed = True
# don't need to release the connection; that's been handled by urllib3