Merge pull request #717 from KeepSafe/awaitable_cbv

Fix for #714

aiohttp/abc.py

@@ -1,7 +1,11 @@
 import asyncio
+import sys
 from abc import ABCMeta, abstractmethod
 
 
+PY_35 = sys.version_info >= (3, 5)
+
+
 class AbstractRouter(metaclass=ABCMeta):
 
     @asyncio.coroutine  # pragma: no branch
@@ -37,3 +41,8 @@ def request(self):
     def __iter__(self):
         while False:  # pragma: no cover
             yield None
+
+    if PY_35:
+        @abstractmethod
+        def __await__(self):
+            return

aiohttp/web_urldispatcher.py

@@ -6,6 +6,7 @@
 import mimetypes
 import re
 import os
+import sys
 import inspect
 
 from collections.abc import Sized, Iterable, Container
@@ -24,6 +25,9 @@
            'Route', 'PlainRoute', 'DynamicRoute', 'StaticRoute', 'View')
 
 
+PY_35 = sys.version_info >= (3, 5)
+
+
 class UrlMappingMatchInfo(dict, AbstractMatchInfo):
 
     def __init__(self, match_dict, route):
@@ -386,6 +390,10 @@ def __iter__(self):
         resp = yield from method()
         return resp
 
+    if PY_35:
+        def __await__(self):
+            return (yield from self.__iter__())
+
     def _raise_allowed_methods(self):
         allowed_methods = {m for m in hdrs.METH_ALL if hasattr(self, m)}
         raise HTTPMethodNotAllowed(self.request.method, allowed_methods)

tests/test_py35/test_cbv35.py

@@ -0,0 +1,19 @@
+import pytest
+
+from aiohttp import web
+from aiohttp.web_urldispatcher import View
+from unittest import mock
+
+
+@pytest.mark.run_loop
+async def test_render_ok():
+    resp = web.Response(text='OK')
+
+    class MyView(View):
+        async def get(self):
+            return resp
+
+    request = mock.Mock()
+    request.method = 'GET'
+    resp2 = await MyView(request)
+    assert resp is resp2