Show More
@@ -1,460 +1,455 b'' | |||||
1 | # Copyright (c) IPython Development Team. |
|
1 | # Copyright (c) IPython Development Team. | |
2 | # Distributed under the terms of the Modified BSD License. |
|
2 | # Distributed under the terms of the Modified BSD License. | |
3 |
|
3 | |||
4 | import json |
|
4 | import json | |
5 | import os |
|
5 | import os | |
6 | import warnings |
|
6 | import warnings | |
7 |
|
7 | |||
8 | from unittest import mock |
|
8 | from unittest import mock | |
9 |
|
9 | |||
10 | import nose.tools as nt |
|
10 | import nose.tools as nt | |
11 |
|
11 | |||
12 | from IPython.core import display |
|
12 | from IPython.core import display | |
13 | from IPython.core.getipython import get_ipython |
|
13 | from IPython.core.getipython import get_ipython | |
14 | from IPython.utils.io import capture_output |
|
14 | from IPython.utils.io import capture_output | |
15 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory |
|
15 | from IPython.utils.tempdir import NamedFileInTemporaryDirectory | |
16 | from IPython import paths as ipath |
|
16 | from IPython import paths as ipath | |
17 | from IPython.testing.tools import AssertNotPrints |
|
17 | from IPython.testing.tools import AssertNotPrints | |
18 |
|
18 | |||
19 | import IPython.testing.decorators as dec |
|
19 | import IPython.testing.decorators as dec | |
20 |
|
20 | |||
21 | def test_image_size(): |
|
21 | def test_image_size(): | |
22 | """Simple test for display.Image(args, width=x,height=y)""" |
|
22 | """Simple test for display.Image(args, width=x,height=y)""" | |
23 | thisurl = 'http://www.google.fr/images/srpr/logo3w.png' |
|
23 | thisurl = 'http://www.google.fr/images/srpr/logo3w.png' | |
24 | img = display.Image(url=thisurl, width=200, height=200) |
|
24 | img = display.Image(url=thisurl, width=200, height=200) | |
25 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) |
|
25 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) | |
26 | img = display.Image(url=thisurl, metadata={'width':200, 'height':200}) |
|
26 | img = display.Image(url=thisurl, metadata={'width':200, 'height':200}) | |
27 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) |
|
27 | nt.assert_equal(u'<img src="%s" width="200" height="200"/>' % (thisurl), img._repr_html_()) | |
28 | img = display.Image(url=thisurl, width=200) |
|
28 | img = display.Image(url=thisurl, width=200) | |
29 | nt.assert_equal(u'<img src="%s" width="200"/>' % (thisurl), img._repr_html_()) |
|
29 | nt.assert_equal(u'<img src="%s" width="200"/>' % (thisurl), img._repr_html_()) | |
30 | img = display.Image(url=thisurl) |
|
30 | img = display.Image(url=thisurl) | |
31 | nt.assert_equal(u'<img src="%s"/>' % (thisurl), img._repr_html_()) |
|
31 | nt.assert_equal(u'<img src="%s"/>' % (thisurl), img._repr_html_()) | |
32 | img = display.Image(url=thisurl, unconfined=True) |
|
32 | img = display.Image(url=thisurl, unconfined=True) | |
33 | nt.assert_equal(u'<img src="%s" class="unconfined"/>' % (thisurl), img._repr_html_()) |
|
33 | nt.assert_equal(u'<img src="%s" class="unconfined"/>' % (thisurl), img._repr_html_()) | |
34 |
|
34 | |||
35 |
|
35 | |||
36 | def test_image_mimes(): |
|
36 | def test_image_mimes(): | |
37 | fmt = get_ipython().display_formatter.format |
|
37 | fmt = get_ipython().display_formatter.format | |
38 | for format in display.Image._ACCEPTABLE_EMBEDDINGS: |
|
38 | for format in display.Image._ACCEPTABLE_EMBEDDINGS: | |
39 | mime = display.Image._MIMETYPES[format] |
|
39 | mime = display.Image._MIMETYPES[format] | |
40 | img = display.Image(b'garbage', format=format) |
|
40 | img = display.Image(b'garbage', format=format) | |
41 | data, metadata = fmt(img) |
|
41 | data, metadata = fmt(img) | |
42 | nt.assert_equal(sorted(data), sorted([mime, 'text/plain'])) |
|
42 | nt.assert_equal(sorted(data), sorted([mime, 'text/plain'])) | |
43 |
|
43 | |||
44 |
|
44 | |||
45 | def test_geojson(): |
|
45 | def test_geojson(): | |
46 |
|
46 | |||
47 | gj = display.GeoJSON(data={ |
|
47 | gj = display.GeoJSON(data={ | |
48 | "type": "Feature", |
|
48 | "type": "Feature", | |
49 | "geometry": { |
|
49 | "geometry": { | |
50 | "type": "Point", |
|
50 | "type": "Point", | |
51 | "coordinates": [-81.327, 296.038] |
|
51 | "coordinates": [-81.327, 296.038] | |
52 | }, |
|
52 | }, | |
53 | "properties": { |
|
53 | "properties": { | |
54 | "name": "Inca City" |
|
54 | "name": "Inca City" | |
55 | } |
|
55 | } | |
56 | }, |
|
56 | }, | |
57 | url_template="http://s3-eu-west-1.amazonaws.com/whereonmars.cartodb.net/{basemap_id}/{z}/{x}/{y}.png", |
|
57 | url_template="http://s3-eu-west-1.amazonaws.com/whereonmars.cartodb.net/{basemap_id}/{z}/{x}/{y}.png", | |
58 | layer_options={ |
|
58 | layer_options={ | |
59 | "basemap_id": "celestia_mars-shaded-16k_global", |
|
59 | "basemap_id": "celestia_mars-shaded-16k_global", | |
60 | "attribution": "Celestia/praesepe", |
|
60 | "attribution": "Celestia/praesepe", | |
61 | "minZoom": 0, |
|
61 | "minZoom": 0, | |
62 | "maxZoom": 18, |
|
62 | "maxZoom": 18, | |
63 | }) |
|
63 | }) | |
64 | nt.assert_equal(u'<IPython.core.display.GeoJSON object>', str(gj)) |
|
64 | nt.assert_equal(u'<IPython.core.display.GeoJSON object>', str(gj)) | |
65 |
|
65 | |||
66 | def test_retina_png(): |
|
66 | def test_retina_png(): | |
67 | here = os.path.dirname(__file__) |
|
67 | here = os.path.dirname(__file__) | |
68 | img = display.Image(os.path.join(here, "2x2.png"), retina=True) |
|
68 | img = display.Image(os.path.join(here, "2x2.png"), retina=True) | |
69 | nt.assert_equal(img.height, 1) |
|
69 | nt.assert_equal(img.height, 1) | |
70 | nt.assert_equal(img.width, 1) |
|
70 | nt.assert_equal(img.width, 1) | |
71 | data, md = img._repr_png_() |
|
71 | data, md = img._repr_png_() | |
72 | nt.assert_equal(md['width'], 1) |
|
72 | nt.assert_equal(md['width'], 1) | |
73 | nt.assert_equal(md['height'], 1) |
|
73 | nt.assert_equal(md['height'], 1) | |
74 |
|
74 | |||
75 | def test_embed_svg_url(): |
|
75 | def test_embed_svg_url(): | |
76 | import gzip |
|
76 | import gzip | |
77 | from io import BytesIO |
|
77 | from io import BytesIO | |
78 | svg_data = b'<svg><circle x="0" y="0" r="1"/></svg>' |
|
78 | svg_data = b'<svg><circle x="0" y="0" r="1"/></svg>' | |
79 | url = 'http://test.com/circle.svg' |
|
79 | url = 'http://test.com/circle.svg' | |
80 |
|
80 | |||
81 | gzip_svg = BytesIO() |
|
81 | gzip_svg = BytesIO() | |
82 | with gzip.open(gzip_svg, 'wb') as fp: |
|
82 | with gzip.open(gzip_svg, 'wb') as fp: | |
83 | fp.write(svg_data) |
|
83 | fp.write(svg_data) | |
84 | gzip_svg = gzip_svg.getvalue() |
|
84 | gzip_svg = gzip_svg.getvalue() | |
85 |
|
85 | |||
86 | def mocked_urlopen(*args, **kwargs): |
|
86 | def mocked_urlopen(*args, **kwargs): | |
87 | class MockResponse: |
|
87 | class MockResponse: | |
88 | def __init__(self, svg): |
|
88 | def __init__(self, svg): | |
89 | self._svg_data = svg |
|
89 | self._svg_data = svg | |
90 | self.headers = {'content-type': 'image/svg+xml'} |
|
90 | self.headers = {'content-type': 'image/svg+xml'} | |
91 |
|
91 | |||
92 | def read(self): |
|
92 | def read(self): | |
93 | return self._svg_data |
|
93 | return self._svg_data | |
94 |
|
94 | |||
95 | if args[0] == url: |
|
95 | if args[0] == url: | |
96 | return MockResponse(svg_data) |
|
96 | return MockResponse(svg_data) | |
97 | elif args[0] == url + 'z': |
|
97 | elif args[0] == url + 'z': | |
98 | ret= MockResponse(gzip_svg) |
|
98 | ret= MockResponse(gzip_svg) | |
99 | ret.headers['content-encoding']= 'gzip' |
|
99 | ret.headers['content-encoding']= 'gzip' | |
100 | return ret |
|
100 | return ret | |
101 | return MockResponse(None) |
|
101 | return MockResponse(None) | |
102 |
|
102 | |||
103 | with mock.patch('urllib.request.urlopen', side_effect=mocked_urlopen): |
|
103 | with mock.patch('urllib.request.urlopen', side_effect=mocked_urlopen): | |
104 | svg = display.SVG(url=url) |
|
104 | svg = display.SVG(url=url) | |
105 | nt.assert_true(svg._repr_svg_().startswith('<svg')) |
|
105 | nt.assert_true(svg._repr_svg_().startswith('<svg')) | |
106 | svg = display.SVG(url=url + 'z') |
|
106 | svg = display.SVG(url=url + 'z') | |
107 | nt.assert_true(svg._repr_svg_().startswith('<svg')) |
|
107 | nt.assert_true(svg._repr_svg_().startswith('<svg')) | |
108 |
|
||||
109 | # do it for real: 6.1kB of data |
|
|||
110 | url = "https://upload.wikimedia.org/wikipedia/commons/3/30/Vector-based_example.svg" |
|
|||
111 | svg = display.SVG(url=url) |
|
|||
112 | nt.assert_true(svg._repr_svg_().startswith('<svg')) |
|
|||
113 |
|
108 | |||
114 | def test_retina_jpeg(): |
|
109 | def test_retina_jpeg(): | |
115 | here = os.path.dirname(__file__) |
|
110 | here = os.path.dirname(__file__) | |
116 | img = display.Image(os.path.join(here, "2x2.jpg"), retina=True) |
|
111 | img = display.Image(os.path.join(here, "2x2.jpg"), retina=True) | |
117 | nt.assert_equal(img.height, 1) |
|
112 | nt.assert_equal(img.height, 1) | |
118 | nt.assert_equal(img.width, 1) |
|
113 | nt.assert_equal(img.width, 1) | |
119 | data, md = img._repr_jpeg_() |
|
114 | data, md = img._repr_jpeg_() | |
120 | nt.assert_equal(md['width'], 1) |
|
115 | nt.assert_equal(md['width'], 1) | |
121 | nt.assert_equal(md['height'], 1) |
|
116 | nt.assert_equal(md['height'], 1) | |
122 |
|
117 | |||
123 | def test_base64image(): |
|
118 | def test_base64image(): | |
124 | display.Image("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB94BCRQnOqNu0b4AAAAKSURBVAjXY2AAAAACAAHiIbwzAAAAAElFTkSuQmCC") |
|
119 | display.Image("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB94BCRQnOqNu0b4AAAAKSURBVAjXY2AAAAACAAHiIbwzAAAAAElFTkSuQmCC") | |
125 |
|
120 | |||
126 | def test_image_filename_defaults(): |
|
121 | def test_image_filename_defaults(): | |
127 | '''test format constraint, and validity of jpeg and png''' |
|
122 | '''test format constraint, and validity of jpeg and png''' | |
128 | tpath = ipath.get_ipython_package_dir() |
|
123 | tpath = ipath.get_ipython_package_dir() | |
129 | nt.assert_raises(ValueError, display.Image, filename=os.path.join(tpath, 'testing/tests/badformat.zip'), |
|
124 | nt.assert_raises(ValueError, display.Image, filename=os.path.join(tpath, 'testing/tests/badformat.zip'), | |
130 | embed=True) |
|
125 | embed=True) | |
131 | nt.assert_raises(ValueError, display.Image) |
|
126 | nt.assert_raises(ValueError, display.Image) | |
132 | nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True) |
|
127 | nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True) | |
133 | # check boths paths to allow packages to test at build and install time |
|
128 | # check boths paths to allow packages to test at build and install time | |
134 | imgfile = os.path.join(tpath, 'core/tests/2x2.png') |
|
129 | imgfile = os.path.join(tpath, 'core/tests/2x2.png') | |
135 | img = display.Image(filename=imgfile) |
|
130 | img = display.Image(filename=imgfile) | |
136 | nt.assert_equal('png', img.format) |
|
131 | nt.assert_equal('png', img.format) | |
137 | nt.assert_is_not_none(img._repr_png_()) |
|
132 | nt.assert_is_not_none(img._repr_png_()) | |
138 | img = display.Image(filename=os.path.join(tpath, 'testing/tests/logo.jpg'), embed=False) |
|
133 | img = display.Image(filename=os.path.join(tpath, 'testing/tests/logo.jpg'), embed=False) | |
139 | nt.assert_equal('jpeg', img.format) |
|
134 | nt.assert_equal('jpeg', img.format) | |
140 | nt.assert_is_none(img._repr_jpeg_()) |
|
135 | nt.assert_is_none(img._repr_jpeg_()) | |
141 |
|
136 | |||
142 | def _get_inline_config(): |
|
137 | def _get_inline_config(): | |
143 | from ipykernel.pylab.config import InlineBackend |
|
138 | from ipykernel.pylab.config import InlineBackend | |
144 | return InlineBackend.instance() |
|
139 | return InlineBackend.instance() | |
145 |
|
140 | |||
146 | @dec.skip_without('matplotlib') |
|
141 | @dec.skip_without('matplotlib') | |
147 | def test_set_matplotlib_close(): |
|
142 | def test_set_matplotlib_close(): | |
148 | cfg = _get_inline_config() |
|
143 | cfg = _get_inline_config() | |
149 | cfg.close_figures = False |
|
144 | cfg.close_figures = False | |
150 | display.set_matplotlib_close() |
|
145 | display.set_matplotlib_close() | |
151 | assert cfg.close_figures |
|
146 | assert cfg.close_figures | |
152 | display.set_matplotlib_close(False) |
|
147 | display.set_matplotlib_close(False) | |
153 | assert not cfg.close_figures |
|
148 | assert not cfg.close_figures | |
154 |
|
149 | |||
155 | _fmt_mime_map = { |
|
150 | _fmt_mime_map = { | |
156 | 'png': 'image/png', |
|
151 | 'png': 'image/png', | |
157 | 'jpeg': 'image/jpeg', |
|
152 | 'jpeg': 'image/jpeg', | |
158 | 'pdf': 'application/pdf', |
|
153 | 'pdf': 'application/pdf', | |
159 | 'retina': 'image/png', |
|
154 | 'retina': 'image/png', | |
160 | 'svg': 'image/svg+xml', |
|
155 | 'svg': 'image/svg+xml', | |
161 | } |
|
156 | } | |
162 |
|
157 | |||
163 | @dec.skip_without('matplotlib') |
|
158 | @dec.skip_without('matplotlib') | |
164 | def test_set_matplotlib_formats(): |
|
159 | def test_set_matplotlib_formats(): | |
165 | from matplotlib.figure import Figure |
|
160 | from matplotlib.figure import Figure | |
166 | formatters = get_ipython().display_formatter.formatters |
|
161 | formatters = get_ipython().display_formatter.formatters | |
167 | for formats in [ |
|
162 | for formats in [ | |
168 | ('png',), |
|
163 | ('png',), | |
169 | ('pdf', 'svg'), |
|
164 | ('pdf', 'svg'), | |
170 | ('jpeg', 'retina', 'png'), |
|
165 | ('jpeg', 'retina', 'png'), | |
171 | (), |
|
166 | (), | |
172 | ]: |
|
167 | ]: | |
173 | active_mimes = {_fmt_mime_map[fmt] for fmt in formats} |
|
168 | active_mimes = {_fmt_mime_map[fmt] for fmt in formats} | |
174 | display.set_matplotlib_formats(*formats) |
|
169 | display.set_matplotlib_formats(*formats) | |
175 | for mime, f in formatters.items(): |
|
170 | for mime, f in formatters.items(): | |
176 | if mime in active_mimes: |
|
171 | if mime in active_mimes: | |
177 | nt.assert_in(Figure, f) |
|
172 | nt.assert_in(Figure, f) | |
178 | else: |
|
173 | else: | |
179 | nt.assert_not_in(Figure, f) |
|
174 | nt.assert_not_in(Figure, f) | |
180 |
|
175 | |||
181 | @dec.skip_without('matplotlib') |
|
176 | @dec.skip_without('matplotlib') | |
182 | def test_set_matplotlib_formats_kwargs(): |
|
177 | def test_set_matplotlib_formats_kwargs(): | |
183 | from matplotlib.figure import Figure |
|
178 | from matplotlib.figure import Figure | |
184 | ip = get_ipython() |
|
179 | ip = get_ipython() | |
185 | cfg = _get_inline_config() |
|
180 | cfg = _get_inline_config() | |
186 | cfg.print_figure_kwargs.update(dict(foo='bar')) |
|
181 | cfg.print_figure_kwargs.update(dict(foo='bar')) | |
187 | kwargs = dict(quality=10) |
|
182 | kwargs = dict(quality=10) | |
188 | display.set_matplotlib_formats('png', **kwargs) |
|
183 | display.set_matplotlib_formats('png', **kwargs) | |
189 | formatter = ip.display_formatter.formatters['image/png'] |
|
184 | formatter = ip.display_formatter.formatters['image/png'] | |
190 | f = formatter.lookup_by_type(Figure) |
|
185 | f = formatter.lookup_by_type(Figure) | |
191 | cell = f.__closure__[0].cell_contents |
|
186 | cell = f.__closure__[0].cell_contents | |
192 | expected = kwargs |
|
187 | expected = kwargs | |
193 | expected.update(cfg.print_figure_kwargs) |
|
188 | expected.update(cfg.print_figure_kwargs) | |
194 | nt.assert_equal(cell, expected) |
|
189 | nt.assert_equal(cell, expected) | |
195 |
|
190 | |||
196 | def test_display_available(): |
|
191 | def test_display_available(): | |
197 | """ |
|
192 | """ | |
198 | Test that display is available without import |
|
193 | Test that display is available without import | |
199 |
|
194 | |||
200 | We don't really care if it's in builtin or anything else, but it should |
|
195 | We don't really care if it's in builtin or anything else, but it should | |
201 | always be available. |
|
196 | always be available. | |
202 | """ |
|
197 | """ | |
203 | ip = get_ipython() |
|
198 | ip = get_ipython() | |
204 | with AssertNotPrints('NameError'): |
|
199 | with AssertNotPrints('NameError'): | |
205 | ip.run_cell('display') |
|
200 | ip.run_cell('display') | |
206 | try: |
|
201 | try: | |
207 | ip.run_cell('del display') |
|
202 | ip.run_cell('del display') | |
208 | except NameError: |
|
203 | except NameError: | |
209 | pass # it's ok, it might be in builtins |
|
204 | pass # it's ok, it might be in builtins | |
210 | # even if deleted it should be back |
|
205 | # even if deleted it should be back | |
211 | with AssertNotPrints('NameError'): |
|
206 | with AssertNotPrints('NameError'): | |
212 | ip.run_cell('display') |
|
207 | ip.run_cell('display') | |
213 |
|
208 | |||
214 | def test_textdisplayobj_pretty_repr(): |
|
209 | def test_textdisplayobj_pretty_repr(): | |
215 | p = display.Pretty("This is a simple test") |
|
210 | p = display.Pretty("This is a simple test") | |
216 | nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>') |
|
211 | nt.assert_equal(repr(p), '<IPython.core.display.Pretty object>') | |
217 | nt.assert_equal(p.data, 'This is a simple test') |
|
212 | nt.assert_equal(p.data, 'This is a simple test') | |
218 |
|
213 | |||
219 | p._show_mem_addr = True |
|
214 | p._show_mem_addr = True | |
220 | nt.assert_equal(repr(p), object.__repr__(p)) |
|
215 | nt.assert_equal(repr(p), object.__repr__(p)) | |
221 |
|
216 | |||
222 | def test_displayobject_repr(): |
|
217 | def test_displayobject_repr(): | |
223 | h = display.HTML('<br />') |
|
218 | h = display.HTML('<br />') | |
224 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') |
|
219 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') | |
225 | h._show_mem_addr = True |
|
220 | h._show_mem_addr = True | |
226 | nt.assert_equal(repr(h), object.__repr__(h)) |
|
221 | nt.assert_equal(repr(h), object.__repr__(h)) | |
227 | h._show_mem_addr = False |
|
222 | h._show_mem_addr = False | |
228 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') |
|
223 | nt.assert_equal(repr(h), '<IPython.core.display.HTML object>') | |
229 |
|
224 | |||
230 | j = display.Javascript('') |
|
225 | j = display.Javascript('') | |
231 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') |
|
226 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') | |
232 | j._show_mem_addr = True |
|
227 | j._show_mem_addr = True | |
233 | nt.assert_equal(repr(j), object.__repr__(j)) |
|
228 | nt.assert_equal(repr(j), object.__repr__(j)) | |
234 | j._show_mem_addr = False |
|
229 | j._show_mem_addr = False | |
235 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') |
|
230 | nt.assert_equal(repr(j), '<IPython.core.display.Javascript object>') | |
236 |
|
231 | |||
237 | @mock.patch('warnings.warn') |
|
232 | @mock.patch('warnings.warn') | |
238 | def test_encourage_iframe_over_html(m_warn): |
|
233 | def test_encourage_iframe_over_html(m_warn): | |
239 | display.HTML() |
|
234 | display.HTML() | |
240 | m_warn.assert_not_called() |
|
235 | m_warn.assert_not_called() | |
241 |
|
236 | |||
242 | display.HTML('<br />') |
|
237 | display.HTML('<br />') | |
243 | m_warn.assert_not_called() |
|
238 | m_warn.assert_not_called() | |
244 |
|
239 | |||
245 | display.HTML('<html><p>Lots of content here</p><iframe src="http://a.com"></iframe>') |
|
240 | display.HTML('<html><p>Lots of content here</p><iframe src="http://a.com"></iframe>') | |
246 | m_warn.assert_not_called() |
|
241 | m_warn.assert_not_called() | |
247 |
|
242 | |||
248 | display.HTML('<iframe src="http://a.com"></iframe>') |
|
243 | display.HTML('<iframe src="http://a.com"></iframe>') | |
249 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') |
|
244 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') | |
250 |
|
245 | |||
251 | m_warn.reset_mock() |
|
246 | m_warn.reset_mock() | |
252 | display.HTML('<IFRAME SRC="http://a.com"></IFRAME>') |
|
247 | display.HTML('<IFRAME SRC="http://a.com"></IFRAME>') | |
253 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') |
|
248 | m_warn.assert_called_with('Consider using IPython.display.IFrame instead') | |
254 |
|
249 | |||
255 | def test_progress(): |
|
250 | def test_progress(): | |
256 | p = display.ProgressBar(10) |
|
251 | p = display.ProgressBar(10) | |
257 | nt.assert_in('0/10',repr(p)) |
|
252 | nt.assert_in('0/10',repr(p)) | |
258 | p.html_width = '100%' |
|
253 | p.html_width = '100%' | |
259 | p.progress = 5 |
|
254 | p.progress = 5 | |
260 | nt.assert_equal(p._repr_html_(), "<progress style='width:100%' max='10' value='5'></progress>") |
|
255 | nt.assert_equal(p._repr_html_(), "<progress style='width:100%' max='10' value='5'></progress>") | |
261 |
|
256 | |||
262 | def test_progress_iter(): |
|
257 | def test_progress_iter(): | |
263 | with capture_output(display=False) as captured: |
|
258 | with capture_output(display=False) as captured: | |
264 | for i in display.ProgressBar(5): |
|
259 | for i in display.ProgressBar(5): | |
265 | out = captured.stdout |
|
260 | out = captured.stdout | |
266 | nt.assert_in('{0}/5'.format(i), out) |
|
261 | nt.assert_in('{0}/5'.format(i), out) | |
267 | out = captured.stdout |
|
262 | out = captured.stdout | |
268 | nt.assert_in('5/5', out) |
|
263 | nt.assert_in('5/5', out) | |
269 |
|
264 | |||
270 | def test_json(): |
|
265 | def test_json(): | |
271 | d = {'a': 5} |
|
266 | d = {'a': 5} | |
272 | lis = [d] |
|
267 | lis = [d] | |
273 | metadata = [ |
|
268 | metadata = [ | |
274 | {'expanded': False, 'root': 'root'}, |
|
269 | {'expanded': False, 'root': 'root'}, | |
275 | {'expanded': True, 'root': 'root'}, |
|
270 | {'expanded': True, 'root': 'root'}, | |
276 | {'expanded': False, 'root': 'custom'}, |
|
271 | {'expanded': False, 'root': 'custom'}, | |
277 | {'expanded': True, 'root': 'custom'}, |
|
272 | {'expanded': True, 'root': 'custom'}, | |
278 | ] |
|
273 | ] | |
279 | json_objs = [ |
|
274 | json_objs = [ | |
280 | display.JSON(d), |
|
275 | display.JSON(d), | |
281 | display.JSON(d, expanded=True), |
|
276 | display.JSON(d, expanded=True), | |
282 | display.JSON(d, root='custom'), |
|
277 | display.JSON(d, root='custom'), | |
283 | display.JSON(d, expanded=True, root='custom'), |
|
278 | display.JSON(d, expanded=True, root='custom'), | |
284 | ] |
|
279 | ] | |
285 | for j, md in zip(json_objs, metadata): |
|
280 | for j, md in zip(json_objs, metadata): | |
286 | nt.assert_equal(j._repr_json_(), (d, md)) |
|
281 | nt.assert_equal(j._repr_json_(), (d, md)) | |
287 |
|
282 | |||
288 | with warnings.catch_warnings(record=True) as w: |
|
283 | with warnings.catch_warnings(record=True) as w: | |
289 | warnings.simplefilter("always") |
|
284 | warnings.simplefilter("always") | |
290 | j = display.JSON(json.dumps(d)) |
|
285 | j = display.JSON(json.dumps(d)) | |
291 | nt.assert_equal(len(w), 1) |
|
286 | nt.assert_equal(len(w), 1) | |
292 | nt.assert_equal(j._repr_json_(), (d, metadata[0])) |
|
287 | nt.assert_equal(j._repr_json_(), (d, metadata[0])) | |
293 |
|
288 | |||
294 | json_objs = [ |
|
289 | json_objs = [ | |
295 | display.JSON(lis), |
|
290 | display.JSON(lis), | |
296 | display.JSON(lis, expanded=True), |
|
291 | display.JSON(lis, expanded=True), | |
297 | display.JSON(lis, root='custom'), |
|
292 | display.JSON(lis, root='custom'), | |
298 | display.JSON(lis, expanded=True, root='custom'), |
|
293 | display.JSON(lis, expanded=True, root='custom'), | |
299 | ] |
|
294 | ] | |
300 | for j, md in zip(json_objs, metadata): |
|
295 | for j, md in zip(json_objs, metadata): | |
301 | nt.assert_equal(j._repr_json_(), (lis, md)) |
|
296 | nt.assert_equal(j._repr_json_(), (lis, md)) | |
302 |
|
297 | |||
303 | with warnings.catch_warnings(record=True) as w: |
|
298 | with warnings.catch_warnings(record=True) as w: | |
304 | warnings.simplefilter("always") |
|
299 | warnings.simplefilter("always") | |
305 | j = display.JSON(json.dumps(lis)) |
|
300 | j = display.JSON(json.dumps(lis)) | |
306 | nt.assert_equal(len(w), 1) |
|
301 | nt.assert_equal(len(w), 1) | |
307 | nt.assert_equal(j._repr_json_(), (lis, metadata[0])) |
|
302 | nt.assert_equal(j._repr_json_(), (lis, metadata[0])) | |
308 |
|
303 | |||
309 | def test_video_embedding(): |
|
304 | def test_video_embedding(): | |
310 | """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash""" |
|
305 | """use a tempfile, with dummy-data, to ensure that video embedding doesn't crash""" | |
311 | v = display.Video("http://ignored") |
|
306 | v = display.Video("http://ignored") | |
312 | assert not v.embed |
|
307 | assert not v.embed | |
313 | html = v._repr_html_() |
|
308 | html = v._repr_html_() | |
314 | nt.assert_not_in('src="data:', html) |
|
309 | nt.assert_not_in('src="data:', html) | |
315 | nt.assert_in('src="http://ignored"', html) |
|
310 | nt.assert_in('src="http://ignored"', html) | |
316 |
|
311 | |||
317 | with nt.assert_raises(ValueError): |
|
312 | with nt.assert_raises(ValueError): | |
318 | v = display.Video(b'abc') |
|
313 | v = display.Video(b'abc') | |
319 |
|
314 | |||
320 | with NamedFileInTemporaryDirectory('test.mp4') as f: |
|
315 | with NamedFileInTemporaryDirectory('test.mp4') as f: | |
321 | f.write(b'abc') |
|
316 | f.write(b'abc') | |
322 | f.close() |
|
317 | f.close() | |
323 |
|
318 | |||
324 | v = display.Video(f.name) |
|
319 | v = display.Video(f.name) | |
325 | assert not v.embed |
|
320 | assert not v.embed | |
326 | html = v._repr_html_() |
|
321 | html = v._repr_html_() | |
327 | nt.assert_not_in('src="data:', html) |
|
322 | nt.assert_not_in('src="data:', html) | |
328 |
|
323 | |||
329 | v = display.Video(f.name, embed=True) |
|
324 | v = display.Video(f.name, embed=True) | |
330 | html = v._repr_html_() |
|
325 | html = v._repr_html_() | |
331 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) |
|
326 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) | |
332 |
|
327 | |||
333 | v = display.Video(f.name, embed=True, mimetype='video/other') |
|
328 | v = display.Video(f.name, embed=True, mimetype='video/other') | |
334 | html = v._repr_html_() |
|
329 | html = v._repr_html_() | |
335 | nt.assert_in('src="data:video/other;base64,YWJj"',html) |
|
330 | nt.assert_in('src="data:video/other;base64,YWJj"',html) | |
336 |
|
331 | |||
337 | v = display.Video(b'abc', embed=True, mimetype='video/mp4') |
|
332 | v = display.Video(b'abc', embed=True, mimetype='video/mp4') | |
338 | html = v._repr_html_() |
|
333 | html = v._repr_html_() | |
339 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) |
|
334 | nt.assert_in('src="data:video/mp4;base64,YWJj"',html) | |
340 |
|
335 | |||
341 | v = display.Video(u'YWJj', embed=True, mimetype='video/xyz') |
|
336 | v = display.Video(u'YWJj', embed=True, mimetype='video/xyz') | |
342 | html = v._repr_html_() |
|
337 | html = v._repr_html_() | |
343 | nt.assert_in('src="data:video/xyz;base64,YWJj"',html) |
|
338 | nt.assert_in('src="data:video/xyz;base64,YWJj"',html) | |
344 |
|
339 | |||
345 | def test_html_metadata(): |
|
340 | def test_html_metadata(): | |
346 | s = "<h1>Test</h1>" |
|
341 | s = "<h1>Test</h1>" | |
347 | h = display.HTML(s, metadata={"isolated": True}) |
|
342 | h = display.HTML(s, metadata={"isolated": True}) | |
348 | nt.assert_equal(h._repr_html_(), (s, {"isolated": True})) |
|
343 | nt.assert_equal(h._repr_html_(), (s, {"isolated": True})) | |
349 |
|
344 | |||
350 | def test_display_id(): |
|
345 | def test_display_id(): | |
351 | ip = get_ipython() |
|
346 | ip = get_ipython() | |
352 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
347 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
353 | handle = display.display('x') |
|
348 | handle = display.display('x') | |
354 | nt.assert_is(handle, None) |
|
349 | nt.assert_is(handle, None) | |
355 | handle = display.display('y', display_id='secret') |
|
350 | handle = display.display('y', display_id='secret') | |
356 | nt.assert_is_instance(handle, display.DisplayHandle) |
|
351 | nt.assert_is_instance(handle, display.DisplayHandle) | |
357 | handle2 = display.display('z', display_id=True) |
|
352 | handle2 = display.display('z', display_id=True) | |
358 | nt.assert_is_instance(handle2, display.DisplayHandle) |
|
353 | nt.assert_is_instance(handle2, display.DisplayHandle) | |
359 | nt.assert_not_equal(handle.display_id, handle2.display_id) |
|
354 | nt.assert_not_equal(handle.display_id, handle2.display_id) | |
360 |
|
355 | |||
361 | nt.assert_equal(pub.call_count, 3) |
|
356 | nt.assert_equal(pub.call_count, 3) | |
362 | args, kwargs = pub.call_args_list[0] |
|
357 | args, kwargs = pub.call_args_list[0] | |
363 | nt.assert_equal(args, ()) |
|
358 | nt.assert_equal(args, ()) | |
364 | nt.assert_equal(kwargs, { |
|
359 | nt.assert_equal(kwargs, { | |
365 | 'data': { |
|
360 | 'data': { | |
366 | 'text/plain': repr('x') |
|
361 | 'text/plain': repr('x') | |
367 | }, |
|
362 | }, | |
368 | 'metadata': {}, |
|
363 | 'metadata': {}, | |
369 | }) |
|
364 | }) | |
370 | args, kwargs = pub.call_args_list[1] |
|
365 | args, kwargs = pub.call_args_list[1] | |
371 | nt.assert_equal(args, ()) |
|
366 | nt.assert_equal(args, ()) | |
372 | nt.assert_equal(kwargs, { |
|
367 | nt.assert_equal(kwargs, { | |
373 | 'data': { |
|
368 | 'data': { | |
374 | 'text/plain': repr('y') |
|
369 | 'text/plain': repr('y') | |
375 | }, |
|
370 | }, | |
376 | 'metadata': {}, |
|
371 | 'metadata': {}, | |
377 | 'transient': { |
|
372 | 'transient': { | |
378 | 'display_id': handle.display_id, |
|
373 | 'display_id': handle.display_id, | |
379 | }, |
|
374 | }, | |
380 | }) |
|
375 | }) | |
381 | args, kwargs = pub.call_args_list[2] |
|
376 | args, kwargs = pub.call_args_list[2] | |
382 | nt.assert_equal(args, ()) |
|
377 | nt.assert_equal(args, ()) | |
383 | nt.assert_equal(kwargs, { |
|
378 | nt.assert_equal(kwargs, { | |
384 | 'data': { |
|
379 | 'data': { | |
385 | 'text/plain': repr('z') |
|
380 | 'text/plain': repr('z') | |
386 | }, |
|
381 | }, | |
387 | 'metadata': {}, |
|
382 | 'metadata': {}, | |
388 | 'transient': { |
|
383 | 'transient': { | |
389 | 'display_id': handle2.display_id, |
|
384 | 'display_id': handle2.display_id, | |
390 | }, |
|
385 | }, | |
391 | }) |
|
386 | }) | |
392 |
|
387 | |||
393 |
|
388 | |||
394 | def test_update_display(): |
|
389 | def test_update_display(): | |
395 | ip = get_ipython() |
|
390 | ip = get_ipython() | |
396 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
391 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
397 | with nt.assert_raises(TypeError): |
|
392 | with nt.assert_raises(TypeError): | |
398 | display.update_display('x') |
|
393 | display.update_display('x') | |
399 | display.update_display('x', display_id='1') |
|
394 | display.update_display('x', display_id='1') | |
400 | display.update_display('y', display_id='2') |
|
395 | display.update_display('y', display_id='2') | |
401 | args, kwargs = pub.call_args_list[0] |
|
396 | args, kwargs = pub.call_args_list[0] | |
402 | nt.assert_equal(args, ()) |
|
397 | nt.assert_equal(args, ()) | |
403 | nt.assert_equal(kwargs, { |
|
398 | nt.assert_equal(kwargs, { | |
404 | 'data': { |
|
399 | 'data': { | |
405 | 'text/plain': repr('x') |
|
400 | 'text/plain': repr('x') | |
406 | }, |
|
401 | }, | |
407 | 'metadata': {}, |
|
402 | 'metadata': {}, | |
408 | 'transient': { |
|
403 | 'transient': { | |
409 | 'display_id': '1', |
|
404 | 'display_id': '1', | |
410 | }, |
|
405 | }, | |
411 | 'update': True, |
|
406 | 'update': True, | |
412 | }) |
|
407 | }) | |
413 | args, kwargs = pub.call_args_list[1] |
|
408 | args, kwargs = pub.call_args_list[1] | |
414 | nt.assert_equal(args, ()) |
|
409 | nt.assert_equal(args, ()) | |
415 | nt.assert_equal(kwargs, { |
|
410 | nt.assert_equal(kwargs, { | |
416 | 'data': { |
|
411 | 'data': { | |
417 | 'text/plain': repr('y') |
|
412 | 'text/plain': repr('y') | |
418 | }, |
|
413 | }, | |
419 | 'metadata': {}, |
|
414 | 'metadata': {}, | |
420 | 'transient': { |
|
415 | 'transient': { | |
421 | 'display_id': '2', |
|
416 | 'display_id': '2', | |
422 | }, |
|
417 | }, | |
423 | 'update': True, |
|
418 | 'update': True, | |
424 | }) |
|
419 | }) | |
425 |
|
420 | |||
426 |
|
421 | |||
427 | def test_display_handle(): |
|
422 | def test_display_handle(): | |
428 | ip = get_ipython() |
|
423 | ip = get_ipython() | |
429 | handle = display.DisplayHandle() |
|
424 | handle = display.DisplayHandle() | |
430 | nt.assert_is_instance(handle.display_id, str) |
|
425 | nt.assert_is_instance(handle.display_id, str) | |
431 | handle = display.DisplayHandle('my-id') |
|
426 | handle = display.DisplayHandle('my-id') | |
432 | nt.assert_equal(handle.display_id, 'my-id') |
|
427 | nt.assert_equal(handle.display_id, 'my-id') | |
433 | with mock.patch.object(ip.display_pub, 'publish') as pub: |
|
428 | with mock.patch.object(ip.display_pub, 'publish') as pub: | |
434 | handle.display('x') |
|
429 | handle.display('x') | |
435 | handle.update('y') |
|
430 | handle.update('y') | |
436 |
|
431 | |||
437 | args, kwargs = pub.call_args_list[0] |
|
432 | args, kwargs = pub.call_args_list[0] | |
438 | nt.assert_equal(args, ()) |
|
433 | nt.assert_equal(args, ()) | |
439 | nt.assert_equal(kwargs, { |
|
434 | nt.assert_equal(kwargs, { | |
440 | 'data': { |
|
435 | 'data': { | |
441 | 'text/plain': repr('x') |
|
436 | 'text/plain': repr('x') | |
442 | }, |
|
437 | }, | |
443 | 'metadata': {}, |
|
438 | 'metadata': {}, | |
444 | 'transient': { |
|
439 | 'transient': { | |
445 | 'display_id': handle.display_id, |
|
440 | 'display_id': handle.display_id, | |
446 | } |
|
441 | } | |
447 | }) |
|
442 | }) | |
448 | args, kwargs = pub.call_args_list[1] |
|
443 | args, kwargs = pub.call_args_list[1] | |
449 | nt.assert_equal(args, ()) |
|
444 | nt.assert_equal(args, ()) | |
450 | nt.assert_equal(kwargs, { |
|
445 | nt.assert_equal(kwargs, { | |
451 | 'data': { |
|
446 | 'data': { | |
452 | 'text/plain': repr('y') |
|
447 | 'text/plain': repr('y') | |
453 | }, |
|
448 | }, | |
454 | 'metadata': {}, |
|
449 | 'metadata': {}, | |
455 | 'transient': { |
|
450 | 'transient': { | |
456 | 'display_id': handle.display_id, |
|
451 | 'display_id': handle.display_id, | |
457 | }, |
|
452 | }, | |
458 | 'update': True, |
|
453 | 'update': True, | |
459 | }) |
|
454 | }) | |
460 |
|
455 |
General Comments 0
You need to be logged in to leave comments.
Login now