Skip to content

Commit

Permalink
Do not strip body before JSON decoding + do not return None on empty …
Browse files Browse the repository at this point in the history
…body (#3482)

This commit actually reverts 6a19364
  • Loading branch information
socketpair committed Jan 4, 2019
1 parent 0715ae7 commit 0682cbf
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions aiohttp/client_reqrep.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ def __init__(self, method: str, url: URL, *,

self._real_url = url
self._url = url.with_fragment(None)
self._body = None # type: Any
self._body = None # type: bytes
self._writer = writer # type: Optional[asyncio.Task[None]]
self._continue = continue100 # None by default
self._closed = True
Expand Down Expand Up @@ -1028,14 +1028,10 @@ async def json(self, *, encoding: str=None,
'unexpected mimetype: %s' % ctype),
headers=self.headers)

stripped = self._body.strip() # type: ignore
if not stripped:
return None

if encoding is None:
encoding = self.get_encoding()

return loads(stripped.decode(encoding))
return loads(self._body.decode(encoding))

async def __aenter__(self) -> 'ClientResponse':
return self
Expand Down

0 comments on commit 0682cbf

Please sign in to comment.