tuse os.join - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit aa1ec8c2924bb109e5d4b339f199995dce824ac8
DIR parent 396515b7f25a7399e10e93f9c7b86dd14bf00099
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 14 Nov 2011 19:11:31 +0100
use os.join
Diffstat:
M client/electrum.py | 8 ++++----
M client/gui.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/client/electrum.py b/client/electrum.py
t@@ -217,11 +217,11 @@ class InvalidPassword(Exception):
if "HOME" in os.environ:
- wallet_dir = os.environ["HOME"] + '/.electrum/'
+ wallet_dir = os.path.join( os.environ["HOME"], '.electrum')
elif "LOCALAPPDATA" in os.environ:
- wallet_dir = os.environ["LOCALAPPDATA"] + '/Electrum/'
+ wallet_dir = os.path.join( os.environ["LOCALAPPDATA"], 'Electrum' )
elif "APPDATA" in os.environ:
- wallet_dir = os.environ["APPDATA"] + '/Electrum/'
+ wallet_dir = os.path.join( os.environ["APPDATA"], 'Electrum' )
else:
print "No home directory found in environment variables."
raise
t@@ -229,7 +229,7 @@ else:
if not os.path.exists( wallet_dir ):
os.mkdir( wallet_dir )
-wallet_path = wallet_dir + '/electrum.dat'
+wallet_path = os.path.join( wallet_dir, 'electrum.dat')
class Wallet:
def __init__(self):
DIR diff --git a/client/gui.py b/client/gui.py
t@@ -760,7 +760,7 @@ class BitcoinGUI:
dt = time.time() - self.update_time
if dt < 2*self.period:
self.status_image.set_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU)
- self.status_image.set_tooltip_text("Connected to %s.\n%d blocks\nrequest time: %f"%(self.wallet.host, self.wallet.blocks, self.wallet.rtime))
+ self.status_image.set_tooltip_text("Connected to %s.\n%d blocks\nresponse time: %f"%(self.wallet.host, self.wallet.blocks, self.wallet.rtime))
else:
self.status_image.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
self.status_image.set_tooltip_text("Trying to contact %s.\n%d blocks"%(self.wallet.host, self.wallet.blocks))