Merge pull request #4939 from jenshnielsen/jupyter4import

tacaswell · tacaswell · commit 681bfd0c08a2 · 2015-08-17T10:20:16.000-04:00
MNT: fix Jupyter shim warning
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -14,7 +14,12 @@
 import tornado.ioloop
 
 from IPython.display import display, Javascript, HTML
-from IPython.kernel.comm import Comm
+try:
+    # Jupyter/IPython 4.x or later
+    from ipykernel.comm import Comm
+except ImportError:
+    # Jupyter/IPython 3.x or earlier
+    from IPython.kernel.comm import Comm
 
 from matplotlib import rcParams
 from matplotlib.figure import Figure
