Skip to content

Commit

Permalink
Merge pull request #848 from ioam/dynamic_style_restoration_skip
Browse files Browse the repository at this point in the history
Disable DynamicMap._deep_indexable in display hook exceptions
  • Loading branch information
philippjfr authored Sep 4, 2016
2 parents ce1ed4c + 0fc4b3b commit d6b41b2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion holoviews/core/dimension.py
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ def __init__(self, data, **params):

def _valid_dimensions(self, dimensions):
"""Validates key dimension input
Returns kdims if no dimensions are specified"""
if dimensions is None:
dimensions = self.kdims
Expand Down
13 changes: 10 additions & 3 deletions holoviews/ipython/display_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,21 @@ def last_frame(obj):
# Display hooks #
#===============#

def option_state(element, state=None):
# Temporary fix to avoid issues with DynamicMap traversal
DynamicMap._deep_indexable = False
optstate = StoreOptions.state(element,state=state)
DynamicMap._deep_indexable = True
return optstate


def display_hook(fn):
@wraps(fn)
def wrapped(element):
global FULL_TRACEBACK
if Store.current_backend is None:
return
optstate = StoreOptions.state(element)
optstate = option_state(element)
try:
html = fn(element,
max_frames=OutputMagic.options['max_frames'],
Expand All @@ -115,7 +122,7 @@ def wrapped(element):
sys.stderr.write("Rendering process skipped: %s" % str(e))
return None
except AbbreviatedException as e:
try: StoreOptions.state(element, state=optstate)
try: option_state(element, state=optstate)
except: pass
FULL_TRACEBACK = '\n'.join(traceback.format_exception(e.etype,
e.value,
Expand All @@ -126,7 +133,7 @@ def wrapped(element):
return "<b>{name}</b>{msg}<br>{message}".format(msg=msg, **info)

except Exception as e:
try: StoreOptions.state(element, state=optstate)
try: option_state(element, state=optstate)
except: pass
raise
return wrapped
Expand Down

0 comments on commit d6b41b2

Please sign in to comment.