Fix aiohttp stub to support version >= 3.1.0

tests/integration/aiohttp_utils.py

@@ -1,15 +1,13 @@
-import asyncio
 import aiohttp
 
 
-@asyncio.coroutine
-def aiohttp_request(loop, method, url, output='text', **kwargs):
+async def aiohttp_request(loop, method, url, output='text', **kwargs):
     with aiohttp.ClientSession(loop=loop) as session:
-        response = yield from session.request(method, url, **kwargs)  # NOQA: E999
+        response = await session.request(method, url, **kwargs)  # NOQA: E999
         if output == 'text':
-            content = yield from response.text()  # NOQA: E999
+            content = await response.text()  # NOQA: E999
         elif output == 'json':
-            content = yield from response.json()  # NOQA: E999
+            content = await response.json()  # NOQA: E999
         elif output == 'raw':
-            content = yield from response.read()  # NOQA: E999
+            content = await response.read()  # NOQA: E999
         return response, content

tests/integration/async_def.py

@@ -1,13 +0,0 @@
-import aiohttp
-import pytest
-import vcr
-
-
-@vcr.use_cassette()
-@pytest.mark.asyncio
-async def test_http():  # noqa: E999
-    async with aiohttp.ClientSession() as session:
-        url = 'https://httpbin.org/get'
-        params = {'ham': 'spam'}
-        resp = await session.get(url, params=params)  # noqa: E999
-        assert (await resp.json())['args'] == {'ham': 'spam'}  # noqa: E999

tests/integration/test_aiohttp.py

@@ -7,12 +7,11 @@ import contextlib  # noqa: E402
 import pytest  # noqa: E402
 import vcr  # noqa: E402
 
-from .aiohttp_utils import aiohttp_request  # noqa: E402
 
 try:
-    from .async_def import test_http  # noqa: F401
+    from .aiohttp_utils import aiohttp_request  # noqa: E402
 except SyntaxError:
-    pass
+    pytest.skip('python<3.5', allow_module_level=True)
 
 
 def run_in_loop(fn):

vcr/stubs/aiohttp_stubs/__init__.py

@@ -12,6 +12,20 @@ from vcr.request import Request
 
 
 class MockClientResponse(ClientResponse):
+    def __init__(self, method, url):
+        super().__init__(
+            method=method,
+            url=url,
+            writer=None,
+            continue100=None,
+            timer=None,
+            request_info=None,
+            auto_decompress=None,
+            traces=None,
+            loop=asyncio.get_event_loop(),
+            session=None,
+        )
+
     # TODO: get encoding from header
     @asyncio.coroutine
     def json(self, *, encoding='utf-8', loads=json.loads):  # NOQA: E999