added web.Request.content and deprecated web.Request.payload

Author: mind1m

aiohttp/web.py

@@ -9,6 +9,7 @@
 import json
 import re
 import os
+import warnings
 
 from urllib.parse import urlsplit, parse_qsl, urlencode, unquote
 from types import MappingProxyType
@@ -283,7 +284,13 @@ def cookies(self):
 
     @property
     def payload(self):
-        """Return raw paiload stream."""
+        """Return raw payload stream."""
+        warnings.warn('use Request.content instead', DeprecationWarning)
+        return self._payload
+
+    @property
+    def content(self):
+        """Return raw payload stream."""
         return self._payload
 
     @asyncio.coroutine

docs/web_reference.rst

@@ -131,13 +131,25 @@ first positional parameter.
 
       Read-only :class:`~aiohttp.multidict.MultiDictProxy` lazy property.
 
+   .. attribute:: content
+
+      A :class:`~aiohttp.streams.FlowControlStreamReader` instance,
+      input stream for reading request's *BODY*.
+
+      Read-only property.
+
    .. attribute:: payload
 
       A :class:`~aiohttp.streams.FlowControlStreamReader` instance,
       input stream for reading request's *BODY*.
 
       Read-only property.
 
+      .. warning::
+
+         Attribute :attr:`~Request.payload` is deprecated, please use
+         :attr:`~Request.content` instead.
+
    .. attribute:: content_type
 
       Read-only property with *content* part of *Content-Type* header.

tests/test_web_request.py

@@ -45,7 +45,9 @@ def test_ctor(self):
         # second call should return the same object
         self.assertIs(get, req.GET)
 
-        self.assertIs(self.payload, req.payload)
+        with self.assertWarns(DeprecationWarning):
+            self.assertIs(self.payload, req.payload)
+        self.assertIs(self.payload, req.content)
         self.assertIs(self.transport, req.transport)
         self.assertTrue(req.keep_alive)