mirror of
https://github.com/kevin1024/vcrpy.git
synced 2025-12-10 09:35:34 +00:00
Use async syntax on aiohttp_utils
This commit is contained in:
@@ -1,22 +1,14 @@
|
|||||||
import asyncio
|
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
|
||||||
|
|
||||||
@asyncio.coroutine
|
async def aiohttp_request(loop, method, url, output='text', encoding='utf-8', **kwargs): # NOQA: E999
|
||||||
def aiohttp_request(loop, method, url, output='text', encoding='utf-8', **kwargs):
|
async with aiohttp.ClientSession(loop=loop) as session: # NOQA: E999
|
||||||
session = aiohttp.ClientSession(loop=loop)
|
async with session.request(method, url, **kwargs) as response: # NOQA: E999
|
||||||
response_ctx = session.request(method, url, **kwargs) # NOQA: E999
|
|
||||||
|
|
||||||
response = yield from response_ctx.__aenter__() # NOQA: E999
|
|
||||||
if output == 'text':
|
if output == 'text':
|
||||||
content = yield from response.text() # NOQA: E999
|
content = await response.text() # NOQA: E999
|
||||||
elif output == 'json':
|
elif output == 'json':
|
||||||
content = yield from response.json(encoding=encoding) # NOQA: E999
|
content = await response.json(encoding=encoding) # NOQA: E999
|
||||||
elif output == 'raw':
|
elif output == 'raw':
|
||||||
content = yield from response.read() # NOQA: E999
|
content = await response.read() # NOQA: E999
|
||||||
|
|
||||||
response_ctx._resp.close()
|
|
||||||
yield from session.close()
|
|
||||||
|
|
||||||
return response, content
|
return response, content
|
||||||
|
|||||||
Reference in New Issue
Block a user