Merge pull request #6734 from minrk/ipython-eventloops

tacaswell · web-flow · commit e9407952d676 · 2016-07-16T10:00:53.000-05:00
MNT: register IPython's eventloop integration in plt.install_repl_displayhook
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -121,7 +121,8 @@ def install_repl_displayhook():
     Install a repl display hook so that any stale figure are automatically
     redrawn when control is returned to the repl.
 
-    This works with both IPython terminals and vanilla python shells.
+    This works with IPython terminals and kernels,
+    as well as vanilla python shells.
     """
     global _IP_REGISTERED
     global _INSTALL_FIG_OBSERVER
@@ -154,6 +155,13 @@ def post_execute():
 
             _IP_REGISTERED = post_execute
             _INSTALL_FIG_OBSERVER = False
+
+            # trigger IPython's eventloop integration, if available
+            from IPython.core.pylabtools import backend2gui
+
+            ipython_gui_name = backend2gui.get(get_backend())
+            if ipython_gui_name:
+                ip.enable_gui(ipython_gui_name)
         else:
             _INSTALL_FIG_OBSERVER = True
 
