Show More
@@ -14,7 +14,7 b' from inspect import getcallargs' | |||
|
14 | 14 | from IPython.core.getipython import get_ipython |
|
15 | 15 | from IPython.html.widgets import (Widget, Text, |
|
16 | 16 | FloatSlider, IntSlider, Checkbox, Dropdown, |
|
17 | Box, Button, DOMWidget) | |
|
17 | Box, Button, DOMWidget, Output) | |
|
18 | 18 | from IPython.display import display, clear_output |
|
19 | 19 | from IPython.utils.py3compat import string_types, unicode_type |
|
20 | 20 | from IPython.utils.traitlets import HasTraits, Any, Unicode |
@@ -204,10 +204,15 b' def interactive(__interact_f, **kwargs):' | |||
|
204 | 204 | if manual: |
|
205 | 205 | manual_button = Button(description="Run %s" % f.__name__) |
|
206 | 206 | c.append(manual_button) |
|
207 | ||
|
208 | # Use an output widget to capture the output of interact. | |
|
209 | output = Output() | |
|
210 | c.append(output) | |
|
207 | 211 | container.children = c |
|
208 | 212 | |
|
209 | 213 | # Build the callback |
|
210 | 214 | def call_f(name=None, old=None, new=None): |
|
215 | with output: | |
|
211 | 216 | container.kwargs = {} |
|
212 | 217 | for widget in kwargs_widgets: |
|
213 | 218 | value = widget.value |
@@ -80,6 +80,7 b' def check_widgets(container, **to_check):' | |||
|
80 | 80 | # build a widget dictionary, so it matches |
|
81 | 81 | widgets = {} |
|
82 | 82 | for w in container.children: |
|
83 | if hasattr(w, 'description'): | |
|
83 | 84 | widgets[w.description] = w |
|
84 | 85 | |
|
85 | 86 | for key, d in to_check.items(): |
@@ -138,7 +139,7 b' def test_single_value_float():' | |||
|
138 | 139 | def test_single_value_int(): |
|
139 | 140 | for a in (1, 5, -3): |
|
140 | 141 | c = interactive(f, a=a) |
|
141 |
nt.assert_equal(len(c.children), |
|
|
142 | nt.assert_equal(len(c.children), 2) | |
|
142 | 143 | w = c.children[0] |
|
143 | 144 | check_widget(w, |
|
144 | 145 | cls=widgets.IntSlider, |
@@ -157,7 +158,7 b' def test_list_tuple_2_int():' | |||
|
157 | 158 | c = interactive(f, tup=(1,-1)) |
|
158 | 159 | for min, max in [ (0,1), (1,10), (1,2), (-5,5), (-20,-19) ]: |
|
159 | 160 | c = interactive(f, tup=(min, max), lis=[min, max]) |
|
160 |
nt.assert_equal(len(c.children), |
|
|
161 | nt.assert_equal(len(c.children), 3) | |
|
161 | 162 | d = dict( |
|
162 | 163 | cls=widgets.IntSlider, |
|
163 | 164 | min=min, |
@@ -174,7 +175,7 b' def test_list_tuple_3_int():' | |||
|
174 | 175 | c = interactive(f, tup=(1,2,-1)) |
|
175 | 176 | for min, max, step in [ (0,2,1), (1,10,2), (1,100,2), (-5,5,4), (-100,-20,4) ]: |
|
176 | 177 | c = interactive(f, tup=(min, max, step), lis=[min, max, step]) |
|
177 |
nt.assert_equal(len(c.children), |
|
|
178 | nt.assert_equal(len(c.children), 3) | |
|
178 | 179 | d = dict( |
|
179 | 180 | cls=widgets.IntSlider, |
|
180 | 181 | min=min, |
@@ -191,7 +192,7 b' def test_list_tuple_2_float():' | |||
|
191 | 192 | c = interactive(f, tup=(0.5,-0.5)) |
|
192 | 193 | for min, max in [ (0.5, 1.5), (1.1,10.2), (1,2.2), (-5.,5), (-20,-19.) ]: |
|
193 | 194 | c = interactive(f, tup=(min, max), lis=[min, max]) |
|
194 |
nt.assert_equal(len(c.children), |
|
|
195 | nt.assert_equal(len(c.children), 3) | |
|
195 | 196 | d = dict( |
|
196 | 197 | cls=widgets.FloatSlider, |
|
197 | 198 | min=min, |
@@ -210,7 +211,7 b' def test_list_tuple_3_float():' | |||
|
210 | 211 | c = interactive(f, tup=(1,2.,-1.)) |
|
211 | 212 | for min, max, step in [ (0.,2,1), (1,10.,2), (1,100,2.), (-5.,5.,4), (-100,-20.,4.) ]: |
|
212 | 213 | c = interactive(f, tup=(min, max, step), lis=[min, max, step]) |
|
213 |
nt.assert_equal(len(c.children), |
|
|
214 | nt.assert_equal(len(c.children), 3) | |
|
214 | 215 | d = dict( |
|
215 | 216 | cls=widgets.FloatSlider, |
|
216 | 217 | min=min, |
@@ -224,7 +225,7 b' def test_list_tuple_str():' | |||
|
224 | 225 | values = ['hello', 'there', 'guy'] |
|
225 | 226 | first = values[0] |
|
226 | 227 | c = interactive(f, tup=tuple(values), lis=list(values)) |
|
227 |
nt.assert_equal(len(c.children), |
|
|
228 | nt.assert_equal(len(c.children), 3) | |
|
228 | 229 | d = dict( |
|
229 | 230 | cls=widgets.Dropdown, |
|
230 | 231 | value=first, |
@@ -471,7 +472,7 b' def test_call_decorated_kwargs_on_trait_change():' | |||
|
471 | 472 | |
|
472 | 473 | def test_fixed(): |
|
473 | 474 | c = interactive(f, a=widgets.fixed(5), b='text') |
|
474 |
nt.assert_equal(len(c.children), |
|
|
475 | nt.assert_equal(len(c.children), 2) | |
|
475 | 476 | w = c.children[0] |
|
476 | 477 | check_widget(w, |
|
477 | 478 | cls=widgets.Text, |
@@ -34,15 +34,24 b' class Output(DOMWidget):' | |||
|
34 | 34 | print('prints to output widget')""" |
|
35 | 35 | _view_name = Unicode('OutputView', sync=True) |
|
36 | 36 | |
|
37 | def __init__(self, *args, **kwargs): | |
|
38 | super(Output, self).__init__(*args, **kwargs) | |
|
39 | from IPython import get_ipython | |
|
40 | ip = get_ipython() | |
|
41 | if ip is not None and hasattr(ip, 'kernel'): | |
|
42 | self._kernel = ip.kernel | |
|
43 | else: | |
|
44 | self._kernel = None | |
|
45 | ||
|
37 | 46 | def clear_output(self, *pargs, **kwargs): |
|
38 | 47 | with self: |
|
39 | 48 | clear_output(*pargs, **kwargs) |
|
40 | 49 | |
|
41 | 50 | def __enter__(self): |
|
42 | 51 | """Called upon entering output widget context manager.""" |
|
52 | if self._kernel is not None: | |
|
43 | 53 | self._flush() |
|
44 | kernel = get_ipython().kernel | |
|
45 | session = kernel.session | |
|
54 | session = self._kernel.session | |
|
46 | 55 | send = session.send |
|
47 | 56 | self._original_send = send |
|
48 | 57 | self._session = session |
@@ -60,7 +69,7 b' class Output(DOMWidget):' | |||
|
60 | 69 | header=header, metadata=metadata) |
|
61 | 70 | |
|
62 | 71 | # If this is a message type that we want to forward, forward it. |
|
63 | if stream is kernel.iopub_socket and msg_type in ['clear_output', 'stream', 'display_data']: | |
|
72 | if stream is self._kernel.iopub_socket and msg_type in ['clear_output', 'stream', 'display_data']: | |
|
64 | 73 | self.send(msg) |
|
65 | 74 | else: |
|
66 | 75 | send(stream, msg, ident=ident, buffers=buffers, track=track) |
@@ -69,6 +78,7 b' class Output(DOMWidget):' | |||
|
69 | 78 | |
|
70 | 79 | def __exit__(self, exception_type, exception_value, traceback): |
|
71 | 80 | """Called upon exiting output widget context manager.""" |
|
81 | if self._kernel is not None: | |
|
72 | 82 | self._flush() |
|
73 | 83 | self._session.send = self._original_send |
|
74 | 84 |
General Comments 0
You need to be logged in to leave comments.
Login now