Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions doc/user_guide/IPython_Magics.rst

This file was deleted.

5 changes: 0 additions & 5 deletions doc/user_guide/Notebook_Magics.rst

This file was deleted.

275 changes: 0 additions & 275 deletions examples/user_guide/Notebook_Magics.ipynb

This file was deleted.

5 changes: 3 additions & 2 deletions holoviews/ipython/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@

from ..core.dimension import LabelledData
from ..core.options import Store
from ..core.pprint import InfoPrinter
from ..core.tree import AttrTree
from ..util import extension
from .display_hooks import display, png_display, pprint_display, svg_display
from .magics import load_magics

InfoPrinter.store = Store

AttrTree._disabled_prefixes = ['_repr_','_ipython_canary_method_should_not_exist']

Expand Down Expand Up @@ -122,7 +124,6 @@ def __call__(self, *args, **params):
loaded = notebook_extension._loaded
if loaded == False:
param_ext.load_ipython_extension(ip, verbose=False)
load_magics(ip)
Store.output_settings.initialize(list(Store.renderers.keys()))
Store.set_display_hook('html+js', LabelledData, pprint_display)
Store.set_display_hook('png', LabelledData, png_display)
Expand Down
25 changes: 0 additions & 25 deletions holoviews/ipython/display_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import IPython
from IPython import get_ipython
from IPython.display import HTML

import holoviews as hv

Expand All @@ -29,7 +28,6 @@
from ..core.traversal import unique_dimkeys
from ..core.util import mimebundle_to_html
from ..util.settings import OutputSettings
from .magics import OptsMagic, OutputMagic

# To assist with debugging of display hooks
FULL_TRACEBACK = None
Expand All @@ -48,21 +46,8 @@ def max_frame_warning(max_frames):
"hv.output(max_frames=<insert number>)"
)

def process_object(obj):
"""Hook to process the object currently being displayed.

"""
invalid_options = OptsMagic.process_element(obj)
if invalid_options: return invalid_options
OutputMagic.info(obj)


def render(obj, **kwargs):
info = process_object(obj)
if info:
display(HTML(info))
return

if render_anim is not None:
return render_anim(obj)

Expand Down Expand Up @@ -234,11 +219,6 @@ def wrapped(element):

@display_hook
def element_display(element, max_frames):
info = process_object(element)
if info:
display(HTML(info))
return None

backend = Store.current_backend
if type(element) not in Store.registry[backend]:
return None
Expand Down Expand Up @@ -347,11 +327,6 @@ def image_display(element, max_frames, fmt):
"""
if fmt not in Store.display_formats:
return None
info = process_object(element)
if info:
display(HTML(info))
return

backend = Store.current_backend
if type(element) not in Store.registry[backend]:
return None
Expand Down
Loading
Loading