From fee873cf9757d21bb87bbf0cf260fb3b081392e3 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 17 Aug 2015 12:48:51 +0100 Subject: [PATCH] NBAgg: fix Jupyter shim warning Import Comm from ipykernel to avoid warning and fall back to the old location if needed --- lib/matplotlib/backends/backend_nbagg.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py index 61ba9d58fd75..146dd91dc8cc 100644 --- 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