memorising of web.Request read, text, json

Author: mind1m

aiohttp/web.py

@@ -172,6 +172,10 @@ def __init__(self, app, message, payload, transport, reader, writer, *,
         self._payload = payload
         self._cookies = None
 
+        self._read_bytes = None
+        self._text = None
+        self._json = None
+
     @property
     def method(self):
         """Read only property for getting HTTP method.
@@ -300,26 +304,32 @@ def read(self):
 
         Returns bytes object with full request content.
         """
-        body = bytearray()
-        while True:
-            chunk = yield from self._payload.readany()
-            body.extend(chunk)
-            if chunk is EOF_MARKER:
-                break
-        return bytes(body)
+        if self._read_bytes is None:
+            body = bytearray()
+            while True:
+                chunk = yield from self._payload.readany()
+                body.extend(chunk)
+                if chunk is EOF_MARKER:
+                    break
+            self._read_bytes = bytes(body)
+        return self._read_bytes
 
     @asyncio.coroutine
     def text(self):
         """Return BODY as text using encoding from .charset."""
-        bytes_body = yield from self.read()
-        encoding = self.charset or 'utf-8'
-        return bytes_body.decode(encoding)
+        if self._text is None:
+            bytes_body = yield from self.read()
+            encoding = self.charset or 'utf-8'
+            self._text = bytes_body.decode(encoding)
+        return self._text
 
     @asyncio.coroutine
     def json(self, *, loader=json.loads):
         """Return BODY as JSON."""
-        body = yield from self.text()
-        return loader(body)
+        if self._json is None:
+            body = yield from self.text()
+            self._json = loader(body)
+        return self._json
 
     @asyncio.coroutine
     def post(self):

docs/web_reference.rst

@@ -173,10 +173,10 @@ first positional parameter.
 
       The method is a :ref:`coroutine <coroutine>`.
 
-      .. warning::
+      .. note::
 
-         The method doesn't store read data internally, subsequent
-         :meth:`~Request.read` call will return empty bytes ``b''``.
+         The method **does** store read data internally, subsequent
+         :meth:`~Request.read` call will return the same value.
 
    .. method:: text()
 
@@ -187,10 +187,10 @@ first positional parameter.
 
       The method is a :ref:`coroutine <coroutine>`.
 
-      .. warning::
+      .. note::
 
-         The method doesn't store read data internally, subsequent
-         :meth:`~Request.text` call will return empty string ``''``.
+         The method **does** store read data internally, subsequent
+         :meth:`~Request.text` call will return the same value.
 
    .. method:: json(*, loader=json.loads)
 
@@ -208,10 +208,10 @@ first positional parameter.
                               and returns :class:`dict` with parsed
                               JSON (:func:`json.loads` by default).
 
-      .. warning::
+      .. note::
 
-         The method doesn't store read data internally, subsequent
-         :meth:`~Request.json` call will raise an exception.
+         The method **does** store read data internally, subsequent
+         :meth:`~Request.json` call will return the same value.
 
    .. method:: post()
 
@@ -226,7 +226,7 @@ first positional parameter.
       *application/x-www-form-urlencoded* or *multipart/form-data*
       returns empty multidict.
 
-      .. warning::
+      .. note::
 
          The method **does** store read data internally, subsequent
          :meth:`~Request.post` call will return the same value.

tests/test_web_functional.py

@@ -80,6 +80,8 @@ def test_post_text(self):
         def handler(request):
             data = yield from request.text()
             self.assertEqual('русский', data)
+            data2 = yield from request.text()
+            self.assertEqual(data, data2)
             return web.Response(text=data)
 
         @asyncio.coroutine
@@ -101,6 +103,8 @@ def test_post_json(self):
         def handler(request):
             data = yield from request.json()
             self.assertEqual(dct, data)
+            data2 = yield from request.json()
+            self.assertEqual(data, data2)
             resp = web.Response()
             resp.content_type = 'application/json'
             resp.body = json.dumps(data).encode('utf8')