AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9921 from f321x/fix_plugin_aiohttp_client_session

Browse Source 
fix: use make_aiohttp_session for plugin zip download
This commit is contained in:
ghost43
2025-06-06 16:20:56 +00:00
committed by GitHub
parent d3921ca25b 18e241edf0
commit 2b5147eb4d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/plugin.py
View File

@@ -46,12 +46,14 @@ from electrum_ecc import ECPrivkey, ECPubkey
from ._vendor.distutils.version import StrictVersion from ._vendor.distutils.version import StrictVersion
from .version import ELECTRUM_VERSION from .version import ELECTRUM_VERSION
from .i18n import _ from .i18n import _
from .util import (profiler, DaemonThread, UserCancelled, ThreadJob, UserFacingException, ChoiceItem, make_dir) from .util import (profiler, DaemonThread, UserCancelled, ThreadJob, UserFacingException, ChoiceItem,
make_dir, make_aiohttp_session)
from . import bip32 from . import bip32
from . import plugins from . import plugins
from .simple_config import SimpleConfig from .simple_config import SimpleConfig
from .logging import get_logger, Logger from .logging import get_logger, Logger
from .crypto import sha256 from .crypto import sha256
from .network import Network
if TYPE_CHECKING: if TYPE_CHECKING:
from .hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase from .hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
@@ -493,7 +495,9 @@ class Plugins(DaemonThread):
path = os.path.join(pkg_path, filename) path = os.path.join(pkg_path, filename)
if os.path.exists(path): if os.path.exists(path):
raise FileExistsError(f"Plugin {filename} already exists at {path}") raise FileExistsError(f"Plugin {filename} already exists at {path}")
async with aiohttp.ClientSession() as session: network = Network.get_instance()
proxy = network.proxy if network else None
async with make_aiohttp_session(proxy=proxy) as session:
async with session.get(url) as resp: async with session.get(url) as resp:
if resp.status == 200: if resp.status == 200:
with open(path, 'wb') as fd: with open(path, 'wb') as fd: