Mercurial Repositories > eric / changeset

--- a/UI/Previewers/PreviewerHTML.py	Sat May 07 15:57:34 2016 +0200
+++ b/UI/Previewers/PreviewerHTML.py	Sun May 08 11:45:55 2016 +0200
@@ -10,8 +10,9 @@
 from __future__ import unicode_literals
 
 try:  # Only for Py2
+    basestring
     import StringIO as io   # __IGNORE_EXCEPTION__
-except ImportError:
+except (ImportError, NameError):
     import io       # __IGNORE_WARNING__
 
 import os

--- a/UI/SymbolsWidget.py	Sat May 07 15:57:34 2016 +0200
+++ b/UI/SymbolsWidget.py	Sun May 08 11:45:55 2016 +0200
@@ -14,7 +14,7 @@
     str = unicode                               # __IGNORE_WARNING__
     chr = unichr                                # __IGNORE_WARNING__
     import htmlentitydefs as html_entities      # __IGNORE_WARNING__
-except NameError:
+except (NameError, ImportError):
     # Py3
     import html.entities as html_entities
 

--- a/eric6.py	Sat May 07 15:57:34 2016 +0200
+++ b/eric6.py	Sun May 08 11:45:55 2016 +0200
@@ -24,8 +24,8 @@
 import Toolbox.PyQt4ImportHook  # __IGNORE_WARNING__
 
 try:  # Only for Py2
+    import Globals.compatibility_fixes     # __IGNORE_WARNING__
     import StringIO as io   # __IGNORE_EXCEPTION__
-    import Globals.compatibility_fixes     # __IGNORE_WARNING__
     import locale
     coverage = 'Python'
 except ImportError: