From 89936689fbae99bdf75a9b76bf3c19abf622f878 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Wed, 9 Nov 2022 10:35:03 +0100 Subject: [PATCH] qml: fix imports, flake issues --- electrum/gui/qml/components/wizard/WCBIP39Refine.qml | 1 - electrum/gui/qml/qebitcoin.py | 2 +- electrum/wizard.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qml/components/wizard/WCBIP39Refine.qml b/electrum/gui/qml/components/wizard/WCBIP39Refine.qml index 2c4dc8ef2..4cacf8a6b 100644 --- a/electrum/gui/qml/components/wizard/WCBIP39Refine.qml +++ b/electrum/gui/qml/components/wizard/WCBIP39Refine.qml @@ -4,7 +4,6 @@ import QtQuick.Controls 2.1 import org.electrum 1.0 -import ".." import "../controls" WizardComponent { diff --git a/electrum/gui/qml/qebitcoin.py b/electrum/gui/qml/qebitcoin.py index 51f496aa2..936bfadbf 100644 --- a/electrum/gui/qml/qebitcoin.py +++ b/electrum/gui/qml/qebitcoin.py @@ -5,7 +5,7 @@ from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject from electrum import mnemonic from electrum import keystore from electrum.i18n import _ -from electrum.bip32 import is_bip32_derivation, xpub_type +from electrum.bip32 import is_bip32_derivation, normalize_bip32_derivation, xpub_type from electrum.logging import get_logger from electrum.slip39 import decode_mnemonic, Slip39Error from electrum.util import parse_URI, create_bip21_uri, InvalidBitcoinURI, get_asyncio_loop diff --git a/electrum/wizard.py b/electrum/wizard.py index 1440e8a1e..afdb8651a 100644 --- a/electrum/wizard.py +++ b/electrum/wizard.py @@ -202,7 +202,7 @@ class NewWalletWizard(AbstractWizard): return wizard_data['seed_variant'] == 'bip39' def is_multisig(self, wizard_data): - return 'multisig' in wizard_data and wizard_data['multisig'] == True + return 'multisig' in wizard_data and wizard_data['multisig'] is True def on_wallet_type(self, wizard_data): t = wizard_data['wallet_type']