Merge from 2.3: Fix for #2239 and other minor fixes

spyderlib/config.py

@@ -149,7 +149,7 @@ def is_ubuntu():
     SANS_SERIF = ['Ubuntu'] + SANS_SERIF
     MONOSPACE = ['Ubuntu Mono'] + MONOSPACE
     BIG = 13
-    MEDIUM = SMALL = 10
+    MEDIUM = SMALL = 11
 else:
     BIG = 12
     MEDIUM = SMALL = 9
@@ -713,7 +713,7 @@ def is_ubuntu():
 # 2. If you want to *remove* options that are no longer needed in our codebase,
 #    you need to do a MAJOR update in version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '16.0.0'
+CONF_VERSION = '16.1.0'
 
 # XXX: Previously we had load=(not DEV) here but DEV was set to *False*.
 # Check if it *really* needs to be updated or not

spyderlib/plugins/inspector.py

@@ -43,13 +43,13 @@
 else:
     IPythonControlWidget = None  # analysis:ignore
 
-# Check for Sphinx presence to activate rich text mode
-if programs.is_module_installed('sphinx', '>=0.6.6'):
-    sphinx_version = programs.get_module_version('sphinx')
+# Check if we can import Sphinx to activate rich text mode
+try:
     from spyderlib.utils.inspector.sphinxify import (CSS_PATH, sphinxify,
                                                      warning, generate_context,
                                                      usage)
-else:
+    sphinx_version = programs.get_module_version('sphinx')
+except ImportError:
     sphinxify = sphinx_version = None  # analysis:ignore
 
 # To add sphinx dependency to the Dependencies dialog

spyderlib/pygments_patch.py

@@ -20,6 +20,7 @@ def apply():
 
     # Patching IPython's patch of RegLexer (Oh God!!)
     from pygments.lexer import _TokenType, Text, Error
+    from spyderlib.py3compat import to_text_string
     try:
         from IPython.qt.console.pygments_highlighter import RegexLexer
     except ImportError:
@@ -69,7 +70,7 @@ def get_tokens_unprocessed(self, text, stack=('root',)):
                         pos += 1
                         statestack = ['root']
                         statetokens = tokendefs['root']
-                        yield pos, Text, u'\n'
+                        yield pos, Text, to_text_string('\n')
                         continue
                     yield pos, Error, text[pos]
                     pos += 1