Merge pull request #30 from samueltardieu/installation-fixes

Installation fixes

electrum

@@ -37,12 +37,11 @@ except ImportError:
     sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
 
 try:
-    from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
+    from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, SimpleConfig
 except ImportError:
-    from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
+    from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, SimpleConfig
 
 from decimal import Decimal
-from lib import SimpleConfig
 
 known_commands = {
     'help':'Prints this help',

lib/gui_lite.py

@@ -18,10 +18,7 @@ import webbrowser
 import history_widget
 import util
 
-try:
-    import lib.gui_qt as gui_qt
-except ImportError:
-    import electrum.gui_qt as gui_qt
+import gui_qt
 
 bitcoin = lambda v: v * 100000000
 

lib/simple_config.py

@@ -1,6 +1,6 @@
 import json
 import os
-from lib.util import user_dir
+from util import user_dir
 
 class SimpleConfig:
   default_options = {"gui": "lite"}

setup.py

@@ -54,6 +54,7 @@ setup(name = "Electrum",
                   'electrum.pyqrnative',
                   'electrum.qrscanner',
                   'electrum.history_widget',
+                  'electrum.simple_config',
                   'electrum.bmp',
                   'electrum.msqr',
                   'electrum.util',