electrum

commit ff9e643dc6bbd71590fe58a9f0a824bc2ea42205
parent 5a212b8648d374da15104867a8d0235c70d662a8
Author: ThomasV <thomasv@gitorious>
Date:   Mon,  5 Nov 2012 17:25:38 +0100

fix: init_path

Diffstat:
M
lib/simple_config.py
 | 
35
+++++++++++++++++++----------------

1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/lib/simple_config.py b/lib/simple_config.py
@@ -48,18 +48,10 @@ class SimpleConfig:
 
         self.wallet_config = {}
         self.wallet_file_exists = False
-        path = None
-        if options:
-            # this will call read_wallet_config only if there is a wallet_path value in options
-            try:
-                path = options.wallet_path
-            except:
-                pass
-        if not path:
-            path = self.get('default_wallet_path')
-        print_error( "path", path )
-        if path:
-            self.read_wallet_config(path)
+        self.init_path(options)
+        print_error( "path", self.path )
+        if self.path:
+            self.read_wallet_config(self.path)
             
             
         
@@ -168,10 +160,22 @@ class SimpleConfig:
                 pass
 
 
-    def init_path(self, wallet_path):
+    def init_path(self, options):
         """Set the path of the wallet."""
-        if wallet_path is not None:
-            self.path = wallet_path
+
+        path = None
+        if options:
+            # this will call read_wallet_config only if there is a wallet_path value in options
+            try:
+                path = options.wallet_path
+            except:
+                pass
+
+        if not path:
+            path = self.get('default_wallet_path')
+
+        if path is not None:
+            self.path = path
             return
 
         # Look for wallet file in the default data directory.
@@ -199,7 +203,6 @@ class SimpleConfig:
 
     def read_wallet_config(self, path):
         """Read the contents of the wallet file."""
-        self.init_path(path)
         try:
             with open(self.path, "r") as f:
                 data = f.read()