Merge pull request #2834 from mdboom/webagg/ipython-detection

tacaswell · tacaswell · commit 76f902ce54b7 · 2014-03-17T19:26:40.000-04:00
WebAgg: Fix IPython detection.  Fix encoding error on Python 3
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -40,15 +40,6 @@
 from matplotlib._pylab_helpers import Gcf
 from . import backend_webagg_core as core
 
-# TODO: This should really only be set for the IPython notebook, but
-# I'm not sure how to detect that.
-try:
-    __IPYTHON__
-except:
-    _in_ipython = False
-else:
-    _in_ipython = True
-
 
 def new_figure_manager(num, *args, **kwargs):
     """
@@ -95,17 +86,7 @@ def mainloop(self):
         WebAggApplication.start()
 
 
-if not _in_ipython:
-    show = Show()
-else:
-    def show():
-        from IPython.display import display_html
-
-        result = []
-        import matplotlib._pylab_helpers as pylab_helpers
-        for manager in pylab_helpers.Gcf().get_all_fig_managers():
-            result.append(ipython_inline_display(manager.canvas.figure))
-        return display_html('\n'.join(result), raw=True)
+show = Show().mainloop
 
 
 class ServerThread(threading.Thread):
@@ -408,7 +389,7 @@ def ipython_inline_display(figure):
         fig_id=fignum,
         toolitems=core.NavigationToolbar2WebAgg.toolitems,
         canvas=figure.canvas,
-        port=WebAggApplication.port)
+        port=WebAggApplication.port).decode('utf-8')
 
 
 FigureCanvas = FigureCanvasWebAgg
