Mercurial Repositories > eric / file diff

--- a/Preferences/__init__.py	Sun Nov 09 14:24:37 2014 +0100
+++ b/Preferences/__init__.py	Sun Nov 09 15:03:04 2014 +0100
@@ -17,6 +17,10 @@
 """
 
 from __future__ import unicode_literals
+try:
+    basestring    # __IGNORE_WARNING__
+except NameError:
+    basestring = str
 
 import os
 import fnmatch
@@ -1498,6 +1502,8 @@
             except TypeError:
                 profiles = None
             if profiles is not None:
+                if isinstance(profiles, basestring):
+                    profiles = eval(profiles)
                 viewProfiles = {}
                 for name in ["edit", "debug"]:
                     viewProfiles[name] = [
@@ -1507,6 +1513,13 @@
                     ]
                     for b in profiles[name][6]:
                         viewProfiles[name][2].append(QByteArray(b))
+                    # correct some entries
+                    while (len(viewProfiles[name][1]) < len(
+                            prefClass.uiDefaults["ViewProfiles2"][name][1])):
+                        viewProfiles[name][1].append(True)
+                    while len(viewProfiles[name][2]) < len(
+                            prefClass.uiDefaults["ViewProfiles2"][name][2]):
+                        viewProfiles[name][2].append(QByteArray())
             else:
                 # use the defaults
                 viewProfiles = prefClass.uiDefaults["ViewProfiles2"]