use os.join

This commit is contained in:
ThomasV 2011-11-14 19:11:31 +01:00
parent 396515b7f2
commit aa1ec8c292
2 changed files with 5 additions and 5 deletions

View File

@ -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
@ -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):

View File

@ -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))