From 58e6050f5257550702ed99b5b67e2303b878ab5d Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Fri, 24 Aug 2012 09:34:30 +0100 Subject: [PATCH] Better looking set_path(wallet_path) method. Flattened function that's easier to read. --- lib/wallet.py | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/wallet.py b/lib/wallet.py index cbf0cdc..023daf7 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -354,19 +354,21 @@ class Wallet: """Set the path of the wallet.""" if wallet_path is not None: self.path = wallet_path + return + # Look for wallet file in the default data directory. + # Keeps backwards compatibility. + if "HOME" in os.environ: + wallet_dir = os.path.join(os.environ["HOME"], ".electrum") + elif "LOCALAPPDATA" in os.environ: + wallet_dir = os.path.join(os.environ["LOCALAPPDATA"], "Electrum") + elif "APPDATA" in os.environ: + wallet_dir = os.path.join(os.environ["APPDATA"], "Electrum") else: - # backward compatibility: look for wallet file in the default data directory - if "HOME" in os.environ: - wallet_dir = os.path.join( os.environ["HOME"], '.electrum') - elif "LOCALAPPDATA" in os.environ: - wallet_dir = os.path.join( os.environ["LOCALAPPDATA"], 'Electrum' ) - elif "APPDATA" in os.environ: - wallet_dir = os.path.join( os.environ["APPDATA"], 'Electrum' ) - else: - raise BaseException("No home directory found in environment variables.") - - if not os.path.exists( wallet_dir ): os.mkdir( wallet_dir ) - self.path = os.path.join( wallet_dir, 'electrum.dat' ) + raise BaseException("No home directory found in environment variables.") + # Make wallet directory if it does not yet exist. + if not os.path.exists(wallet_dir): + os.mkdir(wallet_dir) + self.path = os.path.join(wallet_dir, "electrum.dat") def import_key(self, keypair, password): address, key = keypair.split(':') -- 1.7.1