Merge from 3.x: PR #3599

Fixes #3127
spyder-ide · Oct 25, 2016 · 793628d · 793628d
2 parents 58951d0 + 83e9bc0
commit 793628d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/spyder/config/main.py b/spyder/config/main.py
@@ -591,10 +591,14 @@
 CONF_VERSION = '29.0.0'
 
 # Main configuration instance
-CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not TEST),
-                  version=CONF_VERSION, subfolder=SUBFOLDER, backup=True,
-                  raw_mode=True)
-
+try:
+    CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not TEST),
+                      version=CONF_VERSION, subfolder=SUBFOLDER, backup=True,
+                      raw_mode=True)
+except:
+    CONF = UserConfig('spyder', defaults=DEFAULTS, load=False,
+                      version=CONF_VERSION, subfolder=SUBFOLDER, backup=True,
+                      raw_mode=True)
 
 # Removing old .spyder.ini location:
 old_location = osp.join(get_home_dir(), '.spyder.ini')