Raise TypeError for Mapping as selection options

Author: jtpio

ipywidgets/widgets/tests/test_interaction.py

@@ -182,6 +182,23 @@ def test_list_tuple_invalid():
             print(bad) # because there is no custom message in assert_raises
             c = interactive(f, tup=bad)
 
+def test_dict():
+    for d in [
+        dict(a=5),
+        dict(a=5, b='b', c=dict),
+    ]:
+        with pytest.raises(TypeError):
+            c = interactive(f, d=d)
+
+
+def test_ordereddict():
+    from collections import OrderedDict
+    items = [(3, 300), (1, 100), (2, 200)]
+    first = items[0][1]
+    values = OrderedDict(items)
+    with pytest.raises(TypeError):
+        c = interactive(f, lis=values)
+
 def test_iterable():
     def yield_values():
         yield 3
@@ -549,13 +566,14 @@ def test_multiple_selection():
     check_widget(w, value=(1, 2))
 
     # dict style
-    w.options = {1: 1}
-    check_widget(w, options={1:1})
+    with pytest.raises(TypeError):
+        w = smw(options={1: 1})
 
     # updating
+    w.options = (1,)
     with pytest.raises(TraitError):
         w.value = (2,)
-    check_widget(w, options={1:1})
+    check_widget(w, options=(1,))
 
 
 def test_interact_noinspect():

ipywidgets/widgets/tests/test_widget_selection.py

@@ -1,8 +1,11 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import inspect
 from unittest import TestCase
 
+import pytest
+
 from traitlets import TraitError
 
 from ipywidgets import Dropdown, SelectionSlider, Select
@@ -13,6 +16,10 @@ class TestDropdown(TestCase):
     def test_construction(self):
         Dropdown()
 
+    def test_raise_mapping_options(self):
+        with pytest.raises(TypeError):
+            Dropdown(options={'One': 1, 'Two': 2, 'Three': 3})
+
 
 class TestSelectionSlider(TestCase):
 

ipywidgets/widgets/widget_selection.py

@@ -54,12 +54,11 @@
         The options for the dropdown. This can either be a list of values, e.g.
         ``['Galileo', 'Brahe', 'Hubble']`` or ``[0, 1, 2]``, a list of
         (label, value) pairs, e.g.
-        ``[('Galileo', 0), ('Brahe', 1), ('Hubble', 2)]``,
-        or a dictionary mapping the labels to the values, e.g. ``{'Galileo': 0,
-        'Brahe': 1, 'Hubble': 2}``. The labels are the strings that will be
-        displayed in the UI, representing the actual Python choices, and should
-        be unique. If this is a dictionary, the order in which they are
-        displayed is not guaranteed.
+        ``[('Galileo', 0), ('Brahe', 1), ('Hubble', 2)]``.
+        The labels are the strings that will be displayed in the UI,
+        representing the actual Python choices, and should be unique.
+        If this is a dictionary, the order in which they are displayed is
+        not guaranteed.
 
     index: iterable of int
         The indices of the options that are selected.
@@ -106,6 +105,9 @@ def _make_options(x):
     * an iterable of (label, value) pairs
     * an iterable of values, and labels will be generated
     """
+    if isinstance(x, Mapping):
+        raise TypeError("options must be a list of values or a list of (label, value) tuples")
+
     # only iterate once through the options.
     xlist = tuple(x)
 
@@ -126,7 +128,7 @@ def findvalue(array, value, compare = lambda x, y: x == y):
 class _Selection(DescriptionWidget, ValueWidget, CoreWidget):
     """Base class for Selection widgets
 
-    ``options`` can be specified as a list of values or list of (label, value)
+    ``options`` can be specified as a list of values or a list of (label, value)
     tuples. The labels are the strings that will be displayed in the UI,
     representing the actual Python choices, and should be unique.
     If labels are not specified, they are generated from the values.
@@ -177,7 +179,9 @@ def __init__(self, *args, **kwargs):
 
     @validate('options')
     def _validate_options(self, proposal):
-        proposal.value = tuple(proposal.value)
+        # if an iterator is provided, exhaust it
+        if isinstance(proposal.value, Iterable) and not isinstance(proposal.value, Mapping):
+            proposal.value = tuple(proposal.value)
         # throws an error if there is a problem converting to full form
         self._options_full = _make_options(proposal.value)
         return proposal.value
@@ -283,7 +287,7 @@ class _MultipleSelection(DescriptionWidget, ValueWidget, CoreWidget):
     index = TypedTuple(trait=Int(), help="Selected indices").tag(sync=True)
 
     options = Any((),
-    help="""Iterable of values, (label, value) pairs, or a mapping of {label: value} pairs that the user can select.
+    help="""Iterable of values or (label, value) pairs that the user can select.
 
     The labels are the strings that will be displayed in the UI, representing the
     actual Python choices, and should be unique.