electrum

Electrum Bitcoin wallet
git clone https://git.parazyd.org/electrum
Log | Files | Refs | Submodules

commit db8e6cabb451617081261ee1aefe06ab9a3f1fad
parent 3076eb75eae2725c88e23dc6b0131998f43ec62f
Author: SomberNight <somber.night@protonmail.com>
Date:   Tue, 27 Aug 2019 18:03:01 +0200

bip70 payreq: catch TimeoutError to avoid hanging "please wait" dialog

related #5337

Diffstat:
Melectrum/paymentrequest.py | 7+++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/electrum/paymentrequest.py b/electrum/paymentrequest.py @@ -25,12 +25,11 @@ import hashlib import sys import time -import traceback -import json from typing import Optional +import asyncio +import urllib.parse import certifi -import urllib.parse import aiohttp @@ -87,7 +86,7 @@ async def get_payment_request(url: str) -> 'PaymentRequest': data = resp_content data_len = len(data) if data is not None else None _logger.info(f'fetched payment request {url} {data_len}') - except aiohttp.ClientError as e: + except (aiohttp.ClientError, asyncio.TimeoutError) as e: error = f"Error while contacting payment URL: {url}.\nerror type: {type(e)}" if isinstance(e, aiohttp.ClientResponseError): error += f"\nGot HTTP status code {e.status}."