From 0682cbf272d138a72c42e418c782ea802e7a82b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=B5=D0=BD=D0=B1=D0=B5=D1=80=D0=B3=20?= =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= Date: Sat, 5 Jan 2019 00:58:13 +0500 Subject: [PATCH] Do not strip body before JSON decoding + do not return None on empty body (#3482) This commit actually reverts 6a19364dc4c2591b38efa9410178d48447248e34 --- aiohttp/client_reqrep.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/aiohttp/client_reqrep.py b/aiohttp/client_reqrep.py index 5ef133bf325..dac1a0c9ab3 100644 --- a/aiohttp/client_reqrep.py +++ b/aiohttp/client_reqrep.py @@ -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 @@ -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