Merge pull request #364 from KeepSafe/req_content

Add web.Request.has_body property

Author: asvetlov

aiohttp/web_reqrep.py

@@ -108,6 +108,7 @@ def __init__(self, app, message, payload, transport, reader, writer, *,
         self._cookies = None
 
         self._read_bytes = None
+        self._has_body = not payload.at_eof()
 
     @property
     def method(self):
@@ -224,6 +225,11 @@ def content(self):
         """Return raw payload stream."""
         return self._payload
 
+    @property
+    def has_body(self):
+        """Return True if request has HTTP BODY, False otherwise."""
+        return self._has_body
+
     @asyncio.coroutine
     def release(self):
         """Release request.

docs/web_reference.rst

@@ -139,6 +139,14 @@ first positional parameter.
 
       .. versionadded:: 0.15
 
+   .. attribute:: has_body
+
+      Return ``True`` if request has no *HTTP BODY*, ``False`` otherwise.
+
+      Read-only :class:`bool` property.
+
+      .. versionadded:: 0.16
+
    .. attribute:: payload
 
       A :class:`~aiohttp.streams.FlowControlStreamReader` instance,

tests/test_web_functional.py

@@ -662,3 +662,39 @@ def go():
             f.close()
 
         self.loop.run_until_complete(go())
+
+    def test_empty_content_for_query_without_body(self):
+
+        @asyncio.coroutine
+        def handler(request):
+            self.assertFalse(request.has_body)
+            return web.Response(body=b'OK')
+
+        @asyncio.coroutine
+        def go():
+            _, srv, url = yield from self.create_server('GET', '/', handler)
+            resp = yield from request('GET', url, loop=self.loop)
+            self.assertEqual(200, resp.status)
+            txt = yield from resp.text()
+            self.assertEqual('OK', txt)
+
+        self.loop.run_until_complete(go())
+
+    def test_empty_content_for_query_with_body(self):
+
+        @asyncio.coroutine
+        def handler(request):
+            self.assertTrue(request.has_body)
+            body = yield from request.read()
+            return web.Response(body=body)
+
+        @asyncio.coroutine
+        def go():
+            _, srv, url = yield from self.create_server('POST', '/', handler)
+            resp = yield from request('POST', url, data=b'data',
+                                      loop=self.loop)
+            self.assertEqual(200, resp.status)
+            txt = yield from resp.text()
+            self.assertEqual('data', txt)
+
+        self.loop.run_until_complete(go())