Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/__init__.py	Thu May 20 19:19:33 2021 +0200
+++ b/eric7/Preferences/__init__.py	Thu May 20 19:20:50 2021 +0200
@@ -833,10 +833,9 @@
             InterfacesBrowserFlag |
             OthersBrowserFlag |
             ProtocolsBrowserFlag),
-        "E6Plugin": (
+        "E7Plugin": (
             SourcesBrowserFlag |
             FormsBrowserFlag |
-            ResourcesBrowserFlag |
             TranslationsBrowserFlag |
             InterfacesBrowserFlag |
             OthersBrowserFlag |
@@ -1771,9 +1770,6 @@
             return "standard"
         else:
             return debugClientType
-    elif key in ("PythonExtensions", "Python2VirtualEnv"):
-        # we don't support Python2 anymore
-        return ""
     else:
         return prefClass.settings.value(
             "Debugger/" + key, prefClass.debuggerDefaults[key])
@@ -1798,10 +1794,6 @@
     @param prefClass preferences class used as the storage area
     @return the requested debugger setting
     """
-    if key == "PythonExtensions":
-        # we don't support Python2 anymore
-        return []
-    
     if key == "Python3Extensions":
         exts = []
         for ext in getDebugger(key, prefClass).split():
@@ -1930,7 +1922,7 @@
             "UI/" + key, prefClass.uiDefaults[key]))
     elif key in ["ProxyType/Ftp", ]:
         return E5FtpProxyType(int(prefClass.settings.value(
-            "UI/" + key, prefClass.uiDefaults[key])))
+            "UI/" + key, prefClass.uiDefaults[key].value)))
     elif key in ["ProxyPassword/Http", "ProxyPassword/Https",
                  "ProxyPassword/Ftp", ]:
         from Utilities.crypto import pwConvert