electrum

commit a141c69b25c1cf70639d0fceb8f5c57612588147
parent 24818c14caed89d05cca8f698a0484a804564d33
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 22 Jun 2018 15:19:17 +0200

Merge pull request #4313 from toxeus/master

electrum: cleanup plugin imports
Diffstat:
M
electrum
 | 
2
--
M
lib/plugins.py
 | 
2
+-

2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/electrum b/electrum
@@ -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):
diff --git a/lib/plugins.py b/lib/plugins.py
@@ -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 = {}