diff --git a/holoviews/__init__.py b/holoviews/__init__.py index 74fc8697b9..ea700d1034 100644 --- a/holoviews/__init__.py +++ b/holoviews/__init__.py @@ -29,7 +29,7 @@ from .element import * # noqa (API import) from .element import __all__ as elements_list from . import util # noqa (API import) -from .util import renderer # noqa (API import) +from .util import extension # noqa (API import) # Surpress warnings generated by NumPy in matplotlib # Expected to be fixed in next matplotlib release @@ -40,11 +40,11 @@ try: import IPython # noqa (API import) from .ipython import notebook_extension - renderer = notebook_extension + extension = notebook_extension except ImportError as e: class notebook_extension(param.ParameterizedFunction): def __call__(self, *args, **opts): - raise Exception("IPython notebook not available use hv.renderer utility instead.") + raise Exception("IPython notebook not available: use hv.extension instead.") # A single holoviews.rc file may be executed if found. diff --git a/holoviews/ipython/__init__.py b/holoviews/ipython/__init__.py index 9ef63c3d89..4e3d0dabc6 100644 --- a/holoviews/ipython/__init__.py +++ b/holoviews/ipython/__init__.py @@ -11,7 +11,7 @@ from ..core.options import Store from ..element.comparison import ComparisonTestCase from ..interface.collector import Collector -from ..util import renderer +from ..util import extension from ..plotting.renderer import Renderer from .magics import load_magics from .display_hooks import display # noqa (API import) @@ -73,9 +73,9 @@ def line_magic(self, *args, **kwargs): self.ip.run_line_magic(*args, **kwargs) -class notebook_extension(renderer): +class notebook_extension(extension): """ - Notebook specific extension to hv.renderer that offers options for + Notebook specific extension to hv.extension that offers options for controlling the notebook environment. """ diff --git a/holoviews/util/__init__.py b/holoviews/util/__init__.py index 152d88ed1a..f0417f538e 100644 --- a/holoviews/util/__init__.py +++ b/holoviews/util/__init__.py @@ -39,9 +39,11 @@ def output(line=None, obj=None, **options): output.__doc__ = Store.output_settings._generate_docstring() -class renderer(param.ParameterizedFunction): +class extension(param.ParameterizedFunction): """ - Helper utility used to load rendering backends. + Helper utility used to load holoviews extensions. These can be + plotting extensions, element extensions or anything else that can be + registered to work with HoloViews. """ # Mapping between backend name and module name