From b51129a8b889f622a0b2663aad36f4111c8593b4 Mon Sep 17 00:00:00 2001
From: Philipp Rudiger <P.Rudiger@ed.ac.uk>
Date: Thu, 9 Feb 2017 19:15:52 +0000
Subject: [PATCH] Wrap deprecated bokeh GridPlot in try/except

---
 holoviews/plotting/bokeh/plot.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/holoviews/plotting/bokeh/plot.py b/holoviews/plotting/bokeh/plot.py
index 53a7ed5d7a..dab406f97a 100644
--- a/holoviews/plotting/bokeh/plot.py
+++ b/holoviews/plotting/bokeh/plot.py
@@ -3,8 +3,7 @@
 
 import param
 
-from bokeh.models import (ColumnDataSource, VBox, HBox, Column,
-                          GridPlot as BokehGridPlot, Div)
+from bokeh.models import (ColumnDataSource, VBox, HBox, Column, Div)
 from bokeh.models.widgets import Panel, Tabs
 
 from ...core import (OrderedDict, CompositeOverlay, Store, Layout, GridMatrix,
@@ -20,6 +19,8 @@
 
 if bokeh_version >= '0.12':
     from bokeh.layouts import gridplot
+else:
+    from bokeh.models import GridPlot as BokehGridPlot
 
 
 class BokehPlot(DimensionedPlot):