Browse Source

minor.. move imports out of functions

3.3.3.1
SomberNight 6 years ago
parent
commit
a2ed08615c
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 2
      electrum/gui/qt/history_list.py
  2. 2
      electrum/gui/qt/paytoedit.py
  3. 7
      electrum/wallet.py

2
electrum/gui/qt/history_list.py

@ -25,6 +25,7 @@
import webbrowser import webbrowser
import datetime import datetime
from datetime import date
from electrum.address_synchronizer import TX_HEIGHT_LOCAL from electrum.address_synchronizer import TX_HEIGHT_LOCAL
from .util import * from .util import *
@ -220,7 +221,6 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
self.transactions = r['transactions'] self.transactions = r['transactions']
self.summary = r['summary'] self.summary = r['summary']
if not self.years and self.transactions: if not self.years and self.transactions:
from datetime import date
start_date = self.transactions[0].get('date') or date.today() start_date = self.transactions[0].get('date') or date.today()
end_date = self.transactions[-1].get('date') or date.today() end_date = self.transactions[-1].get('date') or date.today()
self.years = [str(i) for i in range(start_date.year, end_date.year + 1)] self.years = [str(i) for i in range(start_date.year, end_date.year + 1)]

2
electrum/gui/qt/paytoedit.py

@ -237,7 +237,7 @@ class PayToEdit(CompletionTextEdit, ScanQRTextEdit):
#if self.win.config.get('openalias_autoadd') == 'checked': #if self.win.config.get('openalias_autoadd') == 'checked':
self.win.contacts[key] = ('openalias', name) self.win.contacts[key] = ('openalias', name)
self.win.contact_list.on_update() self.win.contact_list.update()
self.setFrozen(True) self.setFrozen(True)
if data.get('type') == 'openalias': if data.get('type') == 'openalias':

7
electrum/wallet.py

@ -43,19 +43,17 @@ from .i18n import _
from .util import (NotEnoughFunds, PrintError, UserCancelled, profiler, from .util import (NotEnoughFunds, PrintError, UserCancelled, profiler,
format_satoshis, format_fee_satoshis, NoDynamicFeeEstimates, format_satoshis, format_fee_satoshis, NoDynamicFeeEstimates,
TimeoutException, WalletFileException, BitcoinException, TimeoutException, WalletFileException, BitcoinException,
InvalidPassword, format_time) InvalidPassword, format_time, timestamp_to_datetime, Satoshis,
Fiat)
from .bitcoin import * from .bitcoin import *
from .version import * from .version import *
from .keystore import load_keystore, Hardware_KeyStore from .keystore import load_keystore, Hardware_KeyStore
from .storage import multisig_type, STO_EV_PLAINTEXT, STO_EV_USER_PW, STO_EV_XPUB_PW from .storage import multisig_type, STO_EV_PLAINTEXT, STO_EV_USER_PW, STO_EV_XPUB_PW
from . import transaction, bitcoin, coinchooser, paymentrequest, contacts from . import transaction, bitcoin, coinchooser, paymentrequest, contacts
from .transaction import Transaction, TxOutput, TxOutputHwInfo from .transaction import Transaction, TxOutput, TxOutputHwInfo
from .plugin import run_hook from .plugin import run_hook
from .address_synchronizer import (AddressSynchronizer, TX_HEIGHT_LOCAL, from .address_synchronizer import (AddressSynchronizer, TX_HEIGHT_LOCAL,
TX_HEIGHT_UNCONF_PARENT, TX_HEIGHT_UNCONFIRMED) TX_HEIGHT_UNCONF_PARENT, TX_HEIGHT_UNCONFIRMED)
from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED from .paymentrequest import PR_PAID, PR_UNPAID, PR_UNKNOWN, PR_EXPIRED
from .paymentrequest import InvoiceStore from .paymentrequest import InvoiceStore
from .contacts import Contacts from .contacts import Contacts
@ -388,7 +386,6 @@ class Abstract_Wallet(AddressSynchronizer):
@profiler @profiler
def get_full_history(self, domain=None, from_timestamp=None, to_timestamp=None, fx=None, show_addresses=False): def get_full_history(self, domain=None, from_timestamp=None, to_timestamp=None, fx=None, show_addresses=False):
from .util import timestamp_to_datetime, Satoshis, Fiat
out = [] out = []
income = 0 income = 0
expenditures = 0 expenditures = 0

Loading…
Cancel
Save