electrum

commit af3fe1722b40f090a9d0eb340fedd1be69475a3b
parent 9407dd3f2f0bab32b96b3d5d3682d7cb21e6bb85
Author: Maran H <maran.hidskes@gmail.com>
Date:   Sun, 16 Sep 2012 10:47:31 -0700

Merge pull request #30 from samueltardieu/installation-fixes

Installation fixes
Diffstat:
M
electrum
 | 
5
++---
M
lib/gui_lite.py
 | 
5
+----
M
lib/simple_config.py
 | 
2
+-
M
setup.py
 | 
1
+

4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/electrum b/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',
diff --git a/lib/gui_lite.py b/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
 
diff --git a/lib/simple_config.py b/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"}
diff --git a/setup.py b/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',