commit 9d0ae2f95b0040312ffe5430a59c7ddbaf8e27d3
parent fcd9752f190d02a04f31137a5910988de2405e68
Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 10 Dec 2019 22:55:11 +0100
adapt to aiohttp 4.0
related: #5753
Diffstat:
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/electrum/daemon.py b/electrum/daemon.py
@@ -30,11 +30,11 @@ import traceback
import sys
import threading
from typing import Dict, Optional, Tuple
-import aiohttp
-from aiohttp import web
from base64 import b64decode
from collections import defaultdict
+import aiohttp
+from aiohttp import web, client_exceptions
import jsonrpcclient
import jsonrpcserver
from jsonrpcserver import response
@@ -54,6 +54,7 @@ from .logging import get_logger, Logger
_logger = get_logger(__name__)
+
class DaemonNotRunning(Exception):
pass
@@ -100,7 +101,7 @@ def request(config: SimpleConfig, endpoint, args=(), timeout=60):
auth = aiohttp.BasicAuth(login=rpc_user, password=rpc_password)
loop = asyncio.get_event_loop()
async def request_coroutine():
- async with aiohttp.ClientSession(auth=auth, loop=loop) as session:
+ async with aiohttp.ClientSession(auth=auth) as session:
server = AiohttpClient(session, server_url)
f = getattr(server, endpoint)
response = await f(*args)