Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved handling of errors in notebook_extension #1290

Merged
merged 1 commit into from
Apr 13, 2017
Merged

Improved handling of errors in notebook_extension #1290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions holoviews/ipython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,22 +162,29 @@ def __call__(self, *args, **params):
__import__('holoviews.plotting.%s' % imp)
if selected_backend is None:
selected_backend = backend
except ImportError:
except Exception as e:
if backend in args:
args.pop(args.index(backend))
if backend in params:
params.pop(backend)
self.warning("HoloViews %s backend could not be imported, "
"ensure %s is installed." % (backend, backend))
if isinstance(e, ImportError):
self.warning("HoloViews %s backend could not be imported, "
"ensure %s is installed." % (backend, backend))
else:
self.warning("Holoviews %s backend could not be imported, "
"it raised the following exception: %s('%s')" %
(backend, type(e).__name__, e))
finally:
if backend == 'matplotlib' and not notebook_extension._loaded:
svg_exporter = Store.renderers['matplotlib'].instance(holomap=None,
fig='svg')
holoviews.archive.exporters = [svg_exporter] +\
holoviews.archive.exporters
if 'matplotlib' in Store.renderers:
svg_exporter = Store.renderers['matplotlib'].instance(holomap=None,
fig='svg')
holoviews.archive.exporters = [svg_exporter] +\
holoviews.archive.exporters
OutputMagic.allowed['backend'] = list_backends()
OutputMagic.allowed['fig'] = list_formats('fig', backend)
OutputMagic.allowed['holomap'] = list_formats('holomap', backend)

resources = self._get_resources(args, params)

ip = params.pop('ip', None)
Expand All @@ -198,6 +205,11 @@ def __call__(self, *args, **params):
set_display_hooks(ip)
notebook_extension._loaded = True

if selected_backend is None:
raise ImportError('None of the backends could be imported')
else:
Store.current_backend = selected_backend

css = ''
if p.width is not None:
css += '<style>div.container { width: %s%% }</style>' % p.width
Expand All @@ -206,14 +218,12 @@ def __call__(self, *args, **params):
if css:
display(HTML(css))

for r in [r for r in resources if r != 'holoviews']:
Store.renderers[r].load_nb(inline=p.inline)
if selected_backend is not None:
Store.current_backend = selected_backend

resources = list(resources)
if len(resources) == 0: return

for r in [r for r in resources if r != 'holoviews']:
Store.renderers[r].load_nb(inline=p.inline)

# Create a message for the logo (if shown)
js_names = {'holoviews':'HoloViewsJS'} # resource : displayed name
loaded = ', '.join(js_names[r] if r in js_names else r.capitalize()+'JS'
Expand Down