use imp to detect and load the local electrum module
This commit is contained in:
37
electrum
37
electrum
@@ -20,6 +20,7 @@ import re
|
|||||||
import sys, os, time, json
|
import sys, os, time, json
|
||||||
import optparse
|
import optparse
|
||||||
import platform
|
import platform
|
||||||
|
from decimal import Decimal
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import ecdsa
|
import ecdsa
|
||||||
@@ -31,13 +32,14 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
|
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
|
||||||
|
|
||||||
try:
|
|
||||||
from lib import *
|
|
||||||
except ImportError:
|
|
||||||
from electrum import *
|
|
||||||
|
|
||||||
from decimal import Decimal
|
# load local module as electrum
|
||||||
|
if os.path.exists("lib"):
|
||||||
|
import imp
|
||||||
|
fp, pathname, description = imp.find_module('lib')
|
||||||
|
imp.load_module('electrum', fp, pathname, description)
|
||||||
|
|
||||||
|
from electrum import *
|
||||||
|
|
||||||
|
|
||||||
# get password routine
|
# get password routine
|
||||||
@@ -115,30 +117,15 @@ if __name__ == '__main__':
|
|||||||
pref_gui = config.get('gui','classic')
|
pref_gui = config.get('gui','classic')
|
||||||
|
|
||||||
if pref_gui == 'gtk':
|
if pref_gui == 'gtk':
|
||||||
try:
|
import electrum.gui as gui
|
||||||
import lib.gui as gui
|
|
||||||
except ImportError:
|
|
||||||
import electrum.gui as gui
|
|
||||||
elif pref_gui in ['classic', 'qt']:
|
elif pref_gui in ['classic', 'qt']:
|
||||||
try:
|
import electrum.gui_qt as gui
|
||||||
import lib.gui_qt as gui
|
|
||||||
except ImportError:
|
|
||||||
import electrum.gui_qt as gui
|
|
||||||
elif pref_gui == 'lite':
|
elif pref_gui == 'lite':
|
||||||
try:
|
import electrum.gui_lite as gui
|
||||||
import lib.gui_lite as gui
|
|
||||||
except ImportError:
|
|
||||||
import electrum.gui_lite as gui
|
|
||||||
elif pref_gui == 'text':
|
elif pref_gui == 'text':
|
||||||
try:
|
import electrum.gui_text as gui
|
||||||
import lib.gui_text as gui
|
|
||||||
except ImportError:
|
|
||||||
import electrum.gui_text as gui
|
|
||||||
elif pref_gui == 'android':
|
elif pref_gui == 'android':
|
||||||
try:
|
import electrum.gui_android as gui
|
||||||
import lib.gui_android as gui
|
|
||||||
except ImportError:
|
|
||||||
import electrum.gui_android as gui
|
|
||||||
else:
|
else:
|
||||||
sys.exit("Error: Unknown GUI: " + pref_gui )
|
sys.exit("Error: Unknown GUI: " + pref_gui )
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user