Merge pull request #1116 from ioam/gridplot_compatibility

Wrap deprecated bokeh GridPlot in try/except
holoviz · Feb 10, 2017 · 173b049 · 173b049
2 parents d80788d + b51129a
commit 173b049
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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):