remove check_windows_wallet_migration

diff --git a/electrum b/electrum
index c1f2c28..15c9f63 100755 (executable)
--- a/electrum
+++ b/electrum
@@ -130,10 +130,6 @@ if __name__ == '__main__':
         for k, v in config_options.items():
             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)
 

diff --git a/lib/util.py b/lib/util.py
index 15b6b85..badf01c 100644 (file)
--- a/lib/util.py
+++ b/lib/util.py
@@ -37,19 +37,6 @@ def print_json(obj):
         s = repr(obj)
     sys.stdout.write(s + "\n")
     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():