Browse Source
Merge pull request #4313 from toxeus/master
electrum: cleanup plugin imports
3.2.x
ThomasV
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
3 deletions
-
electrum
-
lib/plugins.py
|
|
|
@ -69,7 +69,6 @@ if is_local or is_android: |
|
|
|
import imp |
|
|
|
imp.load_module('electrum', *imp.find_module('lib')) |
|
|
|
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 keystore |
|
|
|
from electrum.mnemonic import Mnemonic |
|
|
|
import electrum_plugins |
|
|
|
|
|
|
|
# get password routine |
|
|
|
def prompt_password(prompt, confirm=True): |
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ class Plugins(DaemonThread): |
|
|
|
find = imp.find_module('plugins') |
|
|
|
plugins = imp.load_module('electrum_plugins', *find) |
|
|
|
else: |
|
|
|
plugins = __import__('electrum_plugins') |
|
|
|
import electrum_plugins as plugins |
|
|
|
self.pkgpath = os.path.dirname(plugins.__file__) |
|
|
|
self.config = config |
|
|
|
self.hw_wallets = {} |
|
|
|
|
