Show More
@@ -17,16 +17,38 b' from pathlib import Path, PurePath' | |||
|
17 | 17 | |
|
18 | 18 | from IPython.utils.py3compat import cast_unicode |
|
19 | 19 | from IPython.testing.skipdoctest import skip_doctest |
|
20 | from .display_functions import display, clear_output, publish_display_data, update_display, DisplayHandle | |
|
20 | from . import display_functions | |
|
21 | 21 | |
|
22 | __all__ = ['display', 'display_pretty', 'display_html', 'display_markdown', | |
|
22 | ||
|
23 | __all__ = ['display_pretty', 'display_html', 'display_markdown', | |
|
23 | 24 | 'display_svg', 'display_png', 'display_jpeg', 'display_latex', 'display_json', |
|
24 | 25 | 'display_javascript', 'display_pdf', 'DisplayObject', 'TextDisplayObject', |
|
25 | 26 | 'Pretty', 'HTML', 'Markdown', 'Math', 'Latex', 'SVG', 'ProgressBar', 'JSON', |
|
26 |
'GeoJSON', 'Javascript', 'Image', ' |
|
|
27 | 'set_matplotlib_close', 'publish_display_data', 'update_display', 'DisplayHandle', | |
|
27 | 'GeoJSON', 'Javascript', 'Image', 'set_matplotlib_formats', | |
|
28 | 'set_matplotlib_close', | |
|
28 | 29 | 'Video'] |
|
29 | 30 | |
|
31 | _deprecated_names = ["display", "clear_output", "publish_display_data", "update_display", "DisplayHandle"] | |
|
32 | ||
|
33 | __all__ = __all__ + _deprecated_names | |
|
34 | ||
|
35 | ||
|
36 | # ----- warn to import from IPython.display ----- | |
|
37 | ||
|
38 | from warnings import warn | |
|
39 | ||
|
40 | ||
|
41 | def __getattr__(name): | |
|
42 | if name in _deprecated_names: | |
|
43 | warn(f"Importing {name} from IPython.core.display is deprecated since IPython 7.14, please import from IPython display", DeprecationWarning, stacklevel=2) | |
|
44 | return getattr(display_functions, name) | |
|
45 | ||
|
46 | if name in globals().keys(): | |
|
47 | return globals()[name] | |
|
48 | else: | |
|
49 | raise AttributeError(f"module {__name__} has no attribute {name}") | |
|
50 | ||
|
51 | ||
|
30 | 52 | #----------------------------------------------------------------------------- |
|
31 | 53 | # utility functions |
|
32 | 54 | #----------------------------------------------------------------------------- |
@@ -22,7 +22,7 b' from traitlets.config.configurable import Configurable' | |||
|
22 | 22 | from traitlets import List |
|
23 | 23 | |
|
24 | 24 | # This used to be defined here - it is imported for backwards compatibility |
|
25 | from .display import publish_display_data | |
|
25 | from .display_functions import publish_display_data | |
|
26 | 26 | |
|
27 | 27 | #----------------------------------------------------------------------------- |
|
28 | 28 | # Main payload class |
@@ -12,7 +12,7 b'' | |||
|
12 | 12 | #----------------------------------------------------------------------------- |
|
13 | 13 | |
|
14 | 14 | # Our own packages |
|
15 |
from IPython |
|
|
15 | from IPython.display import display, Javascript, Latex, SVG, HTML, Markdown | |
|
16 | 16 | from IPython.core.magic import ( |
|
17 | 17 | Magics, magics_class, cell_magic |
|
18 | 18 | ) |
@@ -24,7 +24,7 b' import subprocess' | |||
|
24 | 24 | from io import UnsupportedOperation |
|
25 | 25 | |
|
26 | 26 | from IPython import get_ipython |
|
27 |
from IPython |
|
|
27 | from IPython.display import display | |
|
28 | 28 | from IPython.core.error import TryNext |
|
29 | 29 | from IPython.utils.data import chop |
|
30 | 30 | from IPython.utils.process import system |
@@ -354,7 +354,7 b' def import_pylab(user_ns, import_all=True):' | |||
|
354 | 354 | |
|
355 | 355 | # IPython symbols to add |
|
356 | 356 | user_ns['figsize'] = figsize |
|
357 |
from IPython |
|
|
357 | from IPython.display import display | |
|
358 | 358 | # Add display and getfigs to the user's namespace |
|
359 | 359 | user_ns['display'] = display |
|
360 | 360 | user_ns['getfigs'] = getfigs |
@@ -9,7 +9,7 b' from unittest import mock' | |||
|
9 | 9 | |
|
10 | 10 | import nose.tools as nt |
|
11 | 11 | |
|
12 |
from IPython |
|
|
12 | from IPython import display | |
|
13 | 13 | from IPython.core.getipython import get_ipython |
|
14 | 14 | from IPython.utils.io import capture_output |
|
15 | 15 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
@@ -12,5 +12,33 b'' | |||
|
12 | 12 | # Imports |
|
13 | 13 | #----------------------------------------------------------------------------- |
|
14 | 14 | |
|
15 | from IPython.core.display import * | |
|
15 | from IPython.core.display_functions import * | |
|
16 | from IPython.core.display import ( | |
|
17 | display_pretty, | |
|
18 | display_html, | |
|
19 | display_markdown, | |
|
20 | display_svg, | |
|
21 | display_png, | |
|
22 | display_jpeg, | |
|
23 | display_latex, | |
|
24 | display_json, | |
|
25 | display_javascript, | |
|
26 | display_pdf, | |
|
27 | DisplayObject, | |
|
28 | TextDisplayObject, | |
|
29 | Pretty, | |
|
30 | HTML, | |
|
31 | Markdown, | |
|
32 | Math, | |
|
33 | Latex, | |
|
34 | SVG, | |
|
35 | ProgressBar, | |
|
36 | JSON, | |
|
37 | GeoJSON, | |
|
38 | Javascript, | |
|
39 | Image, | |
|
40 | set_matplotlib_formats, | |
|
41 | set_matplotlib_close, | |
|
42 | Video, | |
|
43 | ) | |
|
16 | 44 | from IPython.lib.display import * |
@@ -57,6 +57,7 b" warnings.filterwarnings('error', message='.*onlyif_any_cmd_exists.*', category=D" | |||
|
57 | 57 | warnings.filterwarnings('error', message='.*disable_gui.*', category=DeprecationWarning, module='.*') |
|
58 | 58 | |
|
59 | 59 | warnings.filterwarnings('error', message='.*ExceptionColors global is deprecated.*', category=DeprecationWarning, module='.*') |
|
60 | warnings.filterwarnings('error', message='.*IPython.core.display.*', category=DeprecationWarning, module='.*') | |
|
60 | 61 | |
|
61 | 62 | # Jedi older versions |
|
62 | 63 | warnings.filterwarnings( |
General Comments 0
You need to be logged in to leave comments.
Login now