Mirroring/vcrpy
1
0
Fork 0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-09 01:03:24 +00:00
Code Releases Activity

Merge pull request #368 from lamenezes/fix-json-content-type-on-aiohttp-stub

Browse Source 
Fix content type being passed to aiohttp response stub
This commit is contained in:
Luiz Menezes
2018-07-08 14:46:16 -03:00
committed by GitHub
parent ab6e6b5b5d 75cb067e29
commit 1674741d9f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/integration/aiohttp_utils.py
View File

@@ -5,7 +5,7 @@ import aiohttp
@asyncio.coroutine
def aiohttp_request(loop, method, url, output='text', encoding='utf-8', **kwargs):
def aiohttp_request(loop, method, url, output='text', encoding='utf-8', content_type=None, **kwargs):
session = aiohttp.ClientSession(loop=loop)
response_ctx = session.request(method, url, **kwargs)
@@ -13,7 +13,8 @@ def aiohttp_request(loop, method, url, output='text', encoding='utf-8', **kwargs
if output == 'text':
content = yield from response.text()
elif output == 'json':
content = yield from response.json(encoding=encoding)
content_type = content_type or 'application/json'
content = yield from response.json(encoding=encoding, content_type=content_type)
elif output == 'raw':
content = yield from response.read()

2
vcr/stubs/aiohttp_stubs/__init__.py
View File

@@ -27,7 +27,7 @@ class MockClientResponse(ClientResponse):
# TODO: get encoding from header
@asyncio.coroutine
def json(self, *, encoding='utf-8', loads=json.loads): # NOQA: E999
def json(self, *, encoding='utf-8', loads=json.loads, **kwargs): # NOQA: E999
return loads(self._body.decode(encoding))
@asyncio.coroutine