From 5008cef49104388f8846379ac0a3b3c705fe009d Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Wed, 27 Jul 2022 10:23:35 +0200 Subject: [PATCH] qml: optimize imports --- electrum/gui/qml/__init__.py | 15 +++++--------- electrum/gui/qml/qeaddressdetails.py | 8 +++----- electrum/gui/qml/qebitcoin.py | 9 ++++----- electrum/gui/qml/qechannellistmodel.py | 8 +++----- electrum/gui/qml/qechannelopener.py | 14 ++++++------- electrum/gui/qml/qedaemon.py | 13 +++++-------- electrum/gui/qml/qefx.py | 8 ++++---- electrum/gui/qml/qeinvoice.py | 22 +++++++++------------ electrum/gui/qml/qelnpaymentdetails.py | 4 ++-- electrum/gui/qml/qeswaphelper.py | 8 ++++---- electrum/gui/qml/qetypes.py | 1 - electrum/gui/qml/qewallet.py | 27 +++++++++++--------------- electrum/gui/qml/qewalletdb.py | 2 +- electrum/gui/qml/util.py | 4 +--- 14 files changed, 59 insertions(+), 84 deletions(-) diff --git a/electrum/gui/qml/__init__.py b/electrum/gui/qml/__init__.py index f0113352b..60728d514 100644 --- a/electrum/gui/qml/__init__.py +++ b/electrum/gui/qml/__init__.py @@ -1,10 +1,9 @@ import os import signal import sys -import traceback import threading -import re -from typing import Optional, TYPE_CHECKING, List +import traceback +from typing import TYPE_CHECKING try: import PyQt5 @@ -20,14 +19,10 @@ from PyQt5.QtCore import QLocale, QTimer from PyQt5.QtGui import QGuiApplication import PyQt5.QtCore as QtCore -from electrum.i18n import _, set_language, languages +from electrum.i18n import set_language, languages from electrum.plugin import run_hook -from electrum.base_wizard import GoBack -from electrum.util import (UserCancelled, profiler, - WalletFileException, BitcoinException, get_new_wallet_name) -from electrum.wallet import Wallet, Abstract_Wallet -from electrum.wallet_db import WalletDB -from electrum.logging import Logger, get_logger +from electrum.util import (profiler) +from electrum.logging import Logger if TYPE_CHECKING: from electrum.daemon import Daemon diff --git a/electrum/gui/qml/qeaddressdetails.py b/electrum/gui/qml/qeaddressdetails.py index 67e67fdd9..f81f55478 100644 --- a/electrum/gui/qml/qeaddressdetails.py +++ b/electrum/gui/qml/qeaddressdetails.py @@ -1,13 +1,11 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from decimal import Decimal - from electrum.logging import get_logger -from electrum.util import DECIMAL_POINT_DEFAULT -from .qewallet import QEWallet -from .qetypes import QEAmount from .qetransactionlistmodel import QETransactionListModel +from .qetypes import QEAmount +from .qewallet import QEWallet + class QEAddressDetails(QObject): def __init__(self, parent=None): diff --git a/electrum/gui/qml/qebitcoin.py b/electrum/gui/qml/qebitcoin.py index eb9d1625f..a63aa45f4 100644 --- a/electrum/gui/qml/qebitcoin.py +++ b/electrum/gui/qml/qebitcoin.py @@ -1,17 +1,16 @@ import asyncio -from datetime import datetime from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from electrum.logging import get_logger -from electrum.keystore import bip39_is_checksum_valid +from electrum import mnemonic from electrum.bip32 import is_bip32_derivation +from electrum.keystore import bip39_is_checksum_valid +from electrum.logging import get_logger from electrum.slip39 import decode_mnemonic, Slip39Error -from electrum import mnemonic from electrum.util import parse_URI, create_bip21_uri, InvalidBitcoinURI, get_asyncio_loop - from .qetypes import QEAmount + class QEBitcoin(QObject): def __init__(self, config, parent=None): super().__init__(parent) diff --git a/electrum/gui/qml/qechannellistmodel.py b/electrum/gui/qml/qechannellistmodel.py index c9f7bdad6..6a96fdc9d 100644 --- a/electrum/gui/qml/qechannellistmodel.py +++ b/electrum/gui/qml/qechannellistmodel.py @@ -1,12 +1,10 @@ -from datetime import datetime, timedelta - -from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, Q_ENUMS from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex +from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot +from electrum.lnchannel import ChannelState +from electrum.lnutil import LOCAL, REMOTE from electrum.logging import get_logger from electrum.util import Satoshis -from electrum.lnutil import LOCAL, REMOTE -from electrum.lnchannel import ChannelState from .qetypes import QEAmount from .util import QtEventListener, qt_event_listener diff --git a/electrum/gui/qml/qechannelopener.py b/electrum/gui/qml/qechannelopener.py index 593313304..7a44b5eb5 100644 --- a/electrum/gui/qml/qechannelopener.py +++ b/electrum/gui/qml/qechannelopener.py @@ -2,16 +2,16 @@ import threading from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from electrum.i18n import _ -from electrum.logging import get_logger -from electrum.lnutil import extract_nodeid, ConnStringFormatError, LNPeerAddr, ln_dummy_address -from electrum.lnworker import hardcoded_trampoline_nodes from electrum.gui import messages +from electrum.lnutil import extract_nodeid, LNPeerAddr, ln_dummy_address +from electrum.lnworker import hardcoded_trampoline_nodes +from electrum.logging import get_logger -from .qewallet import QEWallet -from .qetypes import QEAmount -from .qetxfinalizer import QETxFinalizer from .auth import AuthMixin, auth_protect +from .qetxfinalizer import QETxFinalizer +from .qetypes import QEAmount +from .qewallet import QEWallet + class QEChannelOpener(QObject, AuthMixin): def __init__(self, parent=None): diff --git a/electrum/gui/qml/qedaemon.py b/electrum/gui/qml/qedaemon.py index 943d181dc..be44a31d9 100644 --- a/electrum/gui/qml/qedaemon.py +++ b/electrum/gui/qml/qedaemon.py @@ -1,19 +1,16 @@ import os -from decimal import Decimal -from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex +from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from electrum.util import register_callback, get_new_wallet_name, WalletFileException, standardize_path from electrum.logging import get_logger -from electrum.wallet import Wallet, Abstract_Wallet -from electrum.storage import WalletStorage, StorageReadWriteError -from electrum.wallet_db import WalletDB +from electrum.util import WalletFileException, standardize_path +from electrum.wallet import Abstract_Wallet +from .auth import AuthMixin, auth_protect +from .qefx import QEFX from .qewallet import QEWallet from .qewalletdb import QEWalletDB -from .qefx import QEFX -from .auth import AuthMixin, auth_protect # wallet list model. supports both wallet basenames (wallet file basenames) # and whole Wallet instances (loaded wallets) diff --git a/electrum/gui/qml/qefx.py b/electrum/gui/qml/qefx.py index 26644fc59..c7b37c191 100644 --- a/electrum/gui/qml/qefx.py +++ b/electrum/gui/qml/qefx.py @@ -1,15 +1,15 @@ -from decimal import Decimal from datetime import datetime +from decimal import Decimal from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from electrum.logging import get_logger +from electrum.bitcoin import COIN from electrum.exchange_rate import FxThread +from electrum.logging import get_logger from electrum.simple_config import SimpleConfig -from electrum.bitcoin import COIN from .qetypes import QEAmount -from .util import QtEventListener, qt_event_listener, event_listener +from .util import QtEventListener, event_listener class QEFX(QObject, QtEventListener): def __init__(self, fxthread: FxThread, config: SimpleConfig, parent=None): diff --git a/electrum/gui/qml/qeinvoice.py b/electrum/gui/qml/qeinvoice.py index 32e0439ae..b64677510 100644 --- a/electrum/gui/qml/qeinvoice.py +++ b/electrum/gui/qml/qeinvoice.py @@ -1,23 +1,19 @@ -import asyncio -from datetime import datetime - from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, Q_ENUMS -from electrum.logging import get_logger -from electrum.i18n import _ -from electrum.util import (parse_URI, create_bip21_uri, InvalidBitcoinURI, InvoiceError, - maybe_extract_lightning_payment_identifier) -from electrum.invoices import Invoice -from electrum.invoices import (PR_UNPAID,PR_EXPIRED,PR_UNKNOWN,PR_PAID,PR_INFLIGHT, - PR_FAILED,PR_ROUTING,PR_UNCONFIRMED,LN_EXPIRY_NEVER) -from electrum.transaction import PartialTxOutput -from electrum.lnaddr import lndecode from electrum import bitcoin from electrum import lnutil +from electrum.i18n import _ +from electrum.invoices import Invoice +from electrum.invoices import (PR_UNPAID, PR_EXPIRED, PR_UNKNOWN, PR_PAID, PR_INFLIGHT, + PR_FAILED, PR_ROUTING, PR_UNCONFIRMED) from electrum.lnaddr import LnInvoiceException +from electrum.logging import get_logger +from electrum.transaction import PartialTxOutput +from electrum.util import (parse_URI, InvalidBitcoinURI, InvoiceError, + maybe_extract_lightning_payment_identifier) -from .qewallet import QEWallet from .qetypes import QEAmount +from .qewallet import QEWallet class QEInvoice(QObject): class Type: diff --git a/electrum/gui/qml/qelnpaymentdetails.py b/electrum/gui/qml/qelnpaymentdetails.py index 81c391502..dbd662b10 100644 --- a/electrum/gui/qml/qelnpaymentdetails.py +++ b/electrum/gui/qml/qelnpaymentdetails.py @@ -1,10 +1,10 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject from electrum.logging import get_logger -from electrum.util import format_time, bfh, format_time +from electrum.util import bfh, format_time -from .qewallet import QEWallet from .qetypes import QEAmount +from .qewallet import QEWallet class QELnPaymentDetails(QObject): def __init__(self, parent=None): diff --git a/electrum/gui/qml/qeswaphelper.py b/electrum/gui/qml/qeswaphelper.py index d2b0d9fc8..e3b5aec0f 100644 --- a/electrum/gui/qml/qeswaphelper.py +++ b/electrum/gui/qml/qeswaphelper.py @@ -1,17 +1,17 @@ import asyncio -from typing import TYPE_CHECKING, Optional, Union +from typing import Union from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject from electrum.i18n import _ -from electrum.logging import get_logger from electrum.lnutil import ln_dummy_address +from electrum.logging import get_logger from electrum.transaction import PartialTxOutput from electrum.util import NotEnoughFunds, NoDynamicFeeEstimates, profiler -from .qewallet import QEWallet -from .qetypes import QEAmount from .auth import AuthMixin, auth_protect +from .qetypes import QEAmount +from .qewallet import QEWallet class QESwapHelper(AuthMixin, QObject): _logger = get_logger(__name__) diff --git a/electrum/gui/qml/qetypes.py b/electrum/gui/qml/qetypes.py index b2390f052..6d4d9b1ea 100644 --- a/electrum/gui/qml/qetypes.py +++ b/electrum/gui/qml/qetypes.py @@ -2,7 +2,6 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject from electrum.logging import get_logger from electrum.i18n import _ -from electrum.util import profiler # container for satoshi amounts that can be passed around more # easily between python, QML-property and QML-javascript contexts diff --git a/electrum/gui/qml/qewallet.py b/electrum/gui/qml/qewallet.py index 721f01671..5a1c8da9e 100644 --- a/electrum/gui/qml/qewallet.py +++ b/electrum/gui/qml/qewallet.py @@ -1,30 +1,25 @@ -from typing import Optional, TYPE_CHECKING, Sequence, List, Union -import queue -import time import asyncio +import queue import threading +import time +from typing import Optional -from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl, QTimer +from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QTimer +from electrum import bitcoin from electrum.i18n import _ -from electrum.util import (Satoshis, format_time, parse_max_spend, InvalidPassword, - event_listener) +from electrum.invoices import (InvoiceError) from electrum.logging import get_logger -from electrum.wallet import Wallet, Abstract_Wallet -from electrum.storage import StorageEncryptionVersion -from electrum import bitcoin -from electrum.transaction import PartialTxOutput -from electrum.invoices import (Invoice, InvoiceError, - PR_DEFAULT_EXPIRATION_WHEN_CREATING, PR_PAID, - PR_UNPAID, PR_UNKNOWN, PR_EXPIRED, PR_UNCONFIRMED) from electrum.network import TxBroadcastError, BestEffortRequestFailed +from electrum.transaction import PartialTxOutput +from electrum.util import (parse_max_spend, InvalidPassword, event_listener) -from .qeinvoicelistmodel import QEInvoiceListModel, QERequestListModel -from .qetransactionlistmodel import QETransactionListModel +from .auth import AuthMixin, auth_protect from .qeaddresslistmodel import QEAddressListModel from .qechannellistmodel import QEChannelListModel +from .qeinvoicelistmodel import QEInvoiceListModel, QERequestListModel +from .qetransactionlistmodel import QETransactionListModel from .qetypes import QEAmount -from .auth import AuthMixin, auth_protect from .util import QtEventListener, qt_event_listener class QEWallet(AuthMixin, QObject, QtEventListener): diff --git a/electrum/gui/qml/qewalletdb.py b/electrum/gui/qml/qewalletdb.py index 9d585117d..852864ee4 100644 --- a/electrum/gui/qml/qewalletdb.py +++ b/electrum/gui/qml/qewalletdb.py @@ -2,7 +2,7 @@ import os from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject -from electrum.logging import Logger, get_logger +from electrum.logging import get_logger from electrum.storage import WalletStorage, StorageEncryptionVersion from electrum.wallet_db import WalletDB from electrum.bip32 import normalize_bip32_derivation diff --git a/electrum/gui/qml/util.py b/electrum/gui/qml/util.py index 79aff327a..36060e0f5 100644 --- a/electrum/gui/qml/util.py +++ b/electrum/gui/qml/util.py @@ -1,9 +1,7 @@ from functools import wraps -from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject +from PyQt5.QtCore import pyqtSignal -from electrum.logging import get_logger -from electrum.i18n import _ from electrum.util import EventListener, event_listener class QtEventListener(EventListener):