AaronFiore/electrum
1
0
Fork 0
Code Activity

remove check_windows_wallet_migration

Browse Source
This commit is contained in:
ThomasV
2013-10-03 14:00:57 +02:00
parent b4cef1b981
commit 1be0ea1494
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum
View File

@@ -130,10 +130,6 @@ if __name__ == '__main__':
for k, v in config_options.items(): for k, v in config_options.items():
if v is None: config_options.pop(k) if v is None: config_options.pop(k)
# Wallet migration on Electrum 1.7
# Todo: In time we could remove this again
if platform.system() == "Windows":
util.check_windows_wallet_migration()
config = SimpleConfig(config_options) config = SimpleConfig(config_options)

13
lib/util.py
View File

@@ -37,19 +37,6 @@ def print_json(obj):
s = repr(obj) s = repr(obj)
sys.stdout.write(s + "\n") sys.stdout.write(s + "\n")
sys.stdout.flush() sys.stdout.flush()
def check_windows_wallet_migration():
if platform.release() != "XP":
if os.path.exists(os.path.join(os.environ["LOCALAPPDATA"], "Electrum")):
if os.path.exists(os.path.join(os.environ["APPDATA"], "Electrum")):
print_msg("Two Electrum folders have been found, the default Electrum location for Windows has changed from %s to %s since Electrum 1.7, please check your wallets and fix the problem manually." % (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
sys.exit()
try:
shutil.move(os.path.join(os.environ["LOCALAPPDATA"], "Electrum"), os.path.join(os.environ["APPDATA"]))
print_msg("Your wallet has been moved from %s to %s."% (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))
except:
print_msg("Failed to move your wallet.")
def user_dir(): def user_dir():