Fix tests.

Author: jasongrout

ipywidgets/widgets/tests/test_interaction.py

@@ -148,10 +148,10 @@ def test_list_str():
     d = dict(
         cls=widgets.Dropdown,
         value=first,
+        options=tuple(values),
         _options_labels=tuple(values),
         _options_values=tuple(values),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_list_int():
@@ -162,10 +162,9 @@ def test_list_int():
     d = dict(
         cls=widgets.Dropdown,
         value=first,
-        _options_labels=tuple(str(v) for v in values),
+        options=tuple(values),        _options_labels=tuple(str(v) for v in values),
         _options_values=tuple(values),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_list_tuple():
@@ -176,10 +175,10 @@ def test_list_tuple():
     d = dict(
         cls=widgets.Dropdown,
         value=first,
+        options=tuple(values),
         _options_labels=("3", "1", "2"),
         _options_values=(300, 100, 200),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_list_tuple_invalid():
@@ -201,10 +200,10 @@ def test_dict():
             cls=widgets.Dropdown,
             description='d',
             value=next(iter(d.values())),
+            options=d,
             _options_labels=tuple(d.keys()),
             _options_values=tuple(d.values()),
         )
-        check['options'] = tuple(zip(check['_options_labels'], check['_options_values']))
         check_widget(w, **check)
 
 
@@ -222,7 +221,6 @@ def test_ordereddict():
         _options_labels=("3", "1", "2"),
         _options_values=(300, 100, 200),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_iterable():
@@ -236,10 +234,10 @@ def yield_values():
     d = dict(
         cls=widgets.Dropdown,
         value=first,
+        options=(3, 1, 2),
         _options_labels=("3", "1", "2"),
         _options_values=(3, 1, 2),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_iterable_tuple():
@@ -250,10 +248,10 @@ def test_iterable_tuple():
     d = dict(
         cls=widgets.Dropdown,
         value=first,
+        options=tuple(values),
         _options_labels=("3", "1", "2"),
         _options_values=(300, 100, 200),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 def test_mapping():
@@ -278,10 +276,10 @@ def items(self):
     d = dict(
         cls=widgets.Dropdown,
         value=first,
+        options=tuple(items),
         _options_labels=("3", "1", "2"),
         _options_values=(300, 100, 200),
     )
-    d['options'] = tuple(zip(d['_options_labels'], d['_options_values']))
     check_widgets(c, lis=d)
 
 
@@ -327,12 +325,12 @@ def f(n, f=4.5, g=1, h=2, j='there'):
         ),
         h=dict(
             cls=widgets.Dropdown,
-            options=(('a', 1), ('b', 2)),
+            options=OrderedDict([('a',1), ('b',2)]),
             value=2
         ),
         j=dict(
             cls=widgets.Dropdown,
-            options=(('hi', 'hi'), ('there', 'there')),
+            options=('hi', 'there'),
             value='there'
         ),
     )
@@ -350,12 +348,12 @@ def f(f='hi', h=5, j='other'):
         ),
         h=dict(
             cls=widgets.Dropdown,
-            options=(('a', 1),),
+            options={'a': 1},
             value=1,
         ),
         j=dict(
             cls=widgets.Dropdown,
-            options=(('hi', 'hi'), ('there', 'there')),
+            options=('hi', 'there'),
             value='hi',
         ),
     )
@@ -682,7 +680,7 @@ def test_multiple_selection():
 
     # basic multiple select
     w = smw(options=[(1, 1)], value=[1])
-    check_widget(w, cls=smw, value=(1,), options=(('1', 1),))
+    check_widget(w, cls=smw, value=(1,), options=((1, 1),))
 
     # don't accept random other value
     with nt.assert_raises(TraitError):
@@ -691,20 +689,20 @@ def test_multiple_selection():
 
     # change options, which resets value
     w.options = w.options + ((2, 2),)
-    check_widget(w, options=(('1', 1), ('2',2)), value=())
+    check_widget(w, options=((1, 1), (2,2)), value=())
 
     # change value
     w.value = (1,2)
     check_widget(w, value=(1, 2))
 
     # dict style
     w.options = {1: 1}
-    check_widget(w, options=(('1', 1),))
+    check_widget(w, options={1:1})
 
     # updating
     with nt.assert_raises(TraitError):
         w.value = (2,)
-    check_widget(w, options=(('1', 1),))
+    check_widget(w, options={1:1})
 
 
 def test_interact_noinspect():

ipywidgets/widgets/widget_selection.py

@@ -73,7 +73,7 @@ class _Selection(DescriptionWidget, ValueWidget, CoreWidget):
     label = Unicode(None, help="Selected label", allow_none=True)
     index = Int(None, help="Selected index", allow_none=True).tag(sync=True)
 
-    options = Union([Tuple(), Dict()],
+    options = Any((),
     help="""Iterable of values, (label, value) pairs, or a mapping of {label: value} pairs that the user can select.
 
     The labels are the strings that will be displayed in the UI, representing the
@@ -196,7 +196,7 @@ class _MultipleSelection(DescriptionWidget, ValueWidget, CoreWidget):
     label = Tuple(help="Selected labels")
     index = Tuple(help="Selected indices").tag(sync=True)
 
-    options = Union([Tuple(), Dict()],
+    options = Any((),
     help="""Iterable of values, (label, value) pairs, or a mapping of {label: value} pairs that the user can select.
 
     The labels are the strings that will be displayed in the UI, representing the