Merge pull request #2287 from lbryio/aiohttp

use utils.aiohttp for comments
This commit is contained in:
Thomas Zarebczan 2019-07-03 14:12:22 -04:00 committed by GitHub
commit dcb781a57e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,7 +3,7 @@ import time
import hashlib import hashlib
import binascii import binascii
import aiohttp from lbry import utils
import ecdsa import ecdsa
from torba.client.hash import sha256 from torba.client.hash import sha256
from lbry.wallet.transaction import Output from lbry.wallet.transaction import Output
@ -47,10 +47,10 @@ def sign_comment(comment: dict, channel: Output):
async def jsonrpc_post(url: str, method: str, **params) -> any: async def jsonrpc_post(url: str, method: str, **params) -> any:
json_body = {'jsonrpc': '2.0', 'id': None, 'method': method, 'params': params} json_body = {'jsonrpc': '2.0', 'id': None, 'method': method, 'params': params}
headers = {'Content-Type': 'application/json'} headers = {'Content-Type': 'application/json'}
async with aiohttp.request('POST', url, json=json_body, headers=headers) as response: async with utils.aiohttp_request('POST', url, json=json_body, headers=headers) as response:
try: try:
result = await response.json() result = await response.json()
return result['result'] if 'result' in result else result return result['result'] if 'result' in result else result
except aiohttp.client.ContentTypeError as cte: except Exception as cte:
log.exception('Unable to decode respose from server: %s', cte) log.exception('Unable to decode respose from server: %s', cte)
return await response.text() return await response.text()