Merge pull request #4054 from minrk/qtunicodeagain

use unicode for HTML export

IPython/qt/console/rich_ipython_widget.py

@@ -255,15 +255,17 b' class RichIPythonWidget(IPythonWidget):'
             except KeyError:
                 if not self._svg_warning_displayed:
                     QtGui.QMessageBox.warning(self, 'Error converting PNG to SVG.',
-                        'Cannot convert a PNG to SVG.  To fix this, add this '
+                        'Cannot convert PNG images to SVG, export with PNG figures instead. '
+                        'If you want to export matplotlib figures as SVG, add '
                         'to your ipython config:\n\n'
-                        '\tc.InlineBackendConfig.figure_format = \'svg\'\n\n'
+                        '\tc.InlineBackend.figure_format = \'svg\'\n\n'
                         'And regenerate the figures.',
                                               QtGui.QMessageBox.Ok)
                     self._svg_warning_displayed = True
-                return ("<b>Cannot convert a PNG to SVG.</b>  "
-                        "To fix this, add this to your config: "
-                        "<span>c.InlineBackendConfig.figure_format = 'svg'</span> "
+                return ("<b>Cannot convert  PNG images to SVG.</b>  "
+                        "You must export this session with PNG images. "
+                        "If you want to export matplotlib figures as SVG, add to your config "
+                        "<span>c.InlineBackend.figure_format = 'svg'</span> "
                         "and regenerate the figures.")
 
             # Not currently checking path, because it's tricky to find a

IPython/qt/rich_text.py

@@ -4,11 +4,12 b''
 # Imports
 #-----------------------------------------------------------------------------
 
-# Standard library imports.
+# Standard library imports
+import io
 import os
 import re
 
-# System library imports.
+# System library imports
 from IPython.external.qt import QtGui
 
 # IPython imports
@@ -69,7 +70,7 b' class HtmlExporter(object):'
         if dialog.exec_():
             self.filename = dialog.selectedFiles()[0]
             choice = dialog.selectedNameFilter()
-            html = self.control.document().toHtml().encode('utf-8')
+            html = py3compat.cast_unicode(self.control.document().toHtml())
 
             # Configure the exporter.
             if choice.startswith('XHTML'):
@@ -127,8 +128,8 b' def export_html(html, filename, image_tag = None, inline = True):'
 
     Parameters:
     -----------
-    html : str,
-        A utf-8 encoded Python string containing the Qt HTML to export.
+    html : unicode,
+        A Python unicode string containing the Qt HTML to export.
 
     filename : str
         The file to be saved.
@@ -143,8 +144,6 b' def export_html(html, filename, image_tag = None, inline = True):'
     """
     if image_tag is None:
         image_tag = default_image_tag
-    else:
-        image_tag = ensure_utf8(image_tag)
 
     if inline:
         path = None
@@ -154,7 +153,7 b' def export_html(html, filename, image_tag = None, inline = True):'
         if os.path.isfile(path):
             raise OSError("%s exists, but is not a directory." % path)
 
-    with open(filename, 'w') as f:
+    with io.open(filename, 'w', encoding='utf-8') as f:
         html = fix_html(html)
         f.write(IMG_RE.sub(lambda x: image_tag(x, path = path, format = "png"),
                            html))
@@ -165,8 +164,8 b' def export_xhtml(html, filename, image_tag=None):'
 
     Parameters:
     -----------
-    html : str,
-        A utf-8 encoded Python string containing the Qt HTML to export.
+    html : unicode,
+        A Python unicode string containing the Qt HTML to export.
 
     filename : str
         The file to be saved.
@@ -176,15 +175,13 b' def export_xhtml(html, filename, image_tag=None):'
     """
     if image_tag is None:
         image_tag = default_image_tag
-    else:
-        image_tag = ensure_utf8(image_tag)
 
-    with open(filename, 'w') as f:
+    with io.open(filename, 'w', encoding='utf-8') as f:
         # Hack to make xhtml header -- note that we are not doing any check for
         # valid XML.
         offset = html.find("<html>")
         assert offset > -1, 'Invalid HTML string: no <html> tag.'
-        html = ('<html xmlns="http://www.w3.org/1999/xhtml">\n'+
+        html = (u'<html xmlns="http://www.w3.org/1999/xhtml">\n'+
                 html[offset+6:])
 
         html = fix_html(html)
@@ -213,21 +210,7 b' def default_image_tag(match, path = None, format = "png"):'
     format : "png"|"svg", optional [default "png"]
         Format for returned or referenced images.
     """
-    return ''
-
-
-def ensure_utf8(image_tag):
-    """wrapper for ensuring image_tag returns utf8-encoded str on Python 2"""
-    if py3compat.PY3:
-        # nothing to do on Python 3
-        return image_tag
-    
-    def utf8_image_tag(*args, **kwargs):
-        s = image_tag(*args, **kwargs)
-        if isinstance(s, unicode):
-            s = s.encode('utf8')
-        return s
-    return utf8_image_tag
+    return u''
 
 
 def fix_html(html):
@@ -235,8 +218,8 b' def fix_html(html):'
 
     Parameters:
     -----------
-    html : str,
-        A utf-8 encoded Python string containing the Qt HTML.
+    html : unicode,
+        A Python unicode string containing the Qt HTML.
     """
     # A UTF-8 declaration is needed for proper rendering of some characters
     # (e.g., indented commands) when viewing exported HTML on a local system