LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-02 18:25:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4313 from toxeus/master

Browse source 
electrum: cleanup plugin imports
This commit is contained in:
ThomasV 2018-06-22 15:19:17 +02:00 • committed by GitHub
commit a141c69b25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum
View file

@ -69,7 +69,6 @@ if is_local or is_android:
import imp import imp
imp.load_module('electrum', *imp.find_module('lib')) imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui')) imp.load_module('electrum_gui', *imp.find_module('gui'))
imp.load_module('electrum_plugins', *imp.find_module('plugins'))
@ -84,7 +83,6 @@ from electrum.commands import get_parser, known_commands, Commands, config_varia
from electrum import daemon from electrum import daemon
from electrum import keystore from electrum import keystore
from electrum.mnemonic import Mnemonic from electrum.mnemonic import Mnemonic
import electrum_plugins
# get password routine # get password routine
def prompt_password(prompt, confirm=True): def prompt_password(prompt, confirm=True):

2
lib/plugins.py
View file

@ -50,7 +50,7 @@ class Plugins(DaemonThread):
find = imp.find_module('plugins') find = imp.find_module('plugins')
plugins = imp.load_module('electrum_plugins', *find) plugins = imp.load_module('electrum_plugins', *find)
else: else:
plugins = __import__('electrum_plugins') import electrum_plugins as plugins
self.pkgpath = os.path.dirname(plugins.__file__) self.pkgpath = os.path.dirname(plugins.__file__)
self.config = config self.config = config
self.hw_wallets = {} self.hw_wallets = {}