Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/__init__.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Preferences/__init__.py	Sat Aug 31 12:58:11 2019 +0200
@@ -17,10 +17,6 @@
 """
 
 from __future__ import unicode_literals
-try:
-    basestring    # __IGNORE_WARNING__
-except NameError:
-    basestring = str
 
 import os
 import fnmatch
@@ -116,18 +112,12 @@
         "MaxVariableSize": 0,     # Bytes, 0 = no limit
         "BgColorNew": QColor("#28FFEEAA"),
         "BgColorChanged": QColor("#2870FF66"),
-    }
-    debuggerDefaults["AllowedHosts"] = ["127.0.0.1", "::1%0"]
-    if sys.version_info[0] == 2:
+        "AllowedHosts": ["127.0.0.1", "::1%0"],
         # space separated list of Python2 extensions
-        debuggerDefaults["PythonExtensions"] = ".py .pyw .py2 .pyw2 .ptl"
+        "PythonExtensions": ".py2 .pyw2 .ptl",
         # space separated list of Python3 extensions
-        debuggerDefaults["Python3Extensions"] = ".py3 .pyw3"
-    else:
-        # space separated list of Python2 extensions
-        debuggerDefaults["PythonExtensions"] = ".py2 .pyw2 .ptl"
-        # space separated list of Python3 extensions
-        debuggerDefaults["Python3Extensions"] = ".py .pyw .py3 .pyw3"
+        "Python3Extensions": ".py .pyw .py3 .pyw3"
+    }
     
     # defaults for the UI settings
     uiDefaults = {
@@ -3019,7 +3009,7 @@
             download["Downloaded"] = prefClass.settings.value("Downloaded")
             if download["Downloaded"] is None:
                 download["Downloaded"] = QDateTime()
-            elif isinstance(download["Downloaded"], basestring):
+            elif isinstance(download["Downloaded"], str):
                 download["Downloaded"] = QDateTime.fromString(
                     download["Downloaded"], "yyyy-MM-dd hh:mm:ss")
             downloads.append(download)