ListSelector restricted to list type objects (#531)

* limit ListSelector to list type objs * Add tests
holoviz · Jan 16, 2023 · a9ec25b · a9ec25b
1 parent e71f75e
commit a9ec25b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/param/__init__.py b/param/__init__.py
@@ -1914,6 +1914,9 @@ def compute_default(self):
     def _validate(self, val):
         if (val is None and self.allow_None):
             return
+        if not isinstance(val, list):
+            raise ValueError("ListSelector parameter %r only takes list "
+                             "types, not %r." % (self.name, val))
         for o in val:
             super(ListSelector, self)._validate(o)
 

diff --git a/tests/API0/testlistselector.py b/tests/API0/testlistselector.py
@@ -53,7 +53,7 @@ def test_set_object_not_None(self):
         p.g = [7]
         try:
             p.g = None
-        except TypeError:
+        except ValueError:
             pass
         else:
             raise AssertionError("Object set outside range.")
@@ -110,12 +110,12 @@ class Q(param.Parameterized):
     ### new tests (not copied from testobjectselector)
 
     def test_bad_default(self):
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             class Q(param.Parameterized):
                 r = param.ListSelector(default=6,check_on_set=True)
 
     def test_implied_check_on_set(self):
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             class Q(param.Parameterized):
                 r = param.ListSelector(default=7,objects=[7,8])
 
@@ -135,7 +135,7 @@ def test_set_checked_to_be_iterable(self):
         class Q(param.Parameterized):
             r = param.ListSelector(default=6,check_on_set=False)
 
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             Q.r = 6
     ##########################
 

diff --git a/tests/API1/testlistselector.py b/tests/API1/testlistselector.py
@@ -52,7 +52,7 @@ def test_set_object_not_None(self):
         p.g = [7]
         try:
             p.g = None
-        except TypeError:
+        except ValueError:
             pass
         else:
             raise AssertionError("Object set outside range.")
@@ -109,12 +109,12 @@ class Q(param.Parameterized):
     ### new tests (not copied from testobjectselector)
 
     def test_bad_default(self):
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             class Q(param.Parameterized):
                 r = param.ListSelector(default=6,check_on_set=True)
 
     def test_implied_check_on_set(self):
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             class Q(param.Parameterized):
                 r = param.ListSelector(default=7,objects=[7,8])
 
@@ -134,7 +134,7 @@ def test_set_checked_to_be_iterable(self):
         class Q(param.Parameterized):
             r = param.ListSelector(default=6,check_on_set=False)
 
-        with self.assertRaises(TypeError):
+        with self.assertRaises(ValueError):
             Q.r = 6
     ##########################
 
@@ -154,3 +154,16 @@ class Q(param.Parameterized):
 
         with self.assertRaises(TypeError):
             Q.param.params('r').compute_default()
+
+    def test_initialization_bad_iterable(self):
+        with self.assertRaises(ValueError):
+            class Q(param.Parameterized):
+                j = param.ListSelector('ab', ['a', 'b', 'c', 'd'])
+
+    def test_set_bad_iterable(self):
+        class Q(param.Parameterized):
+            r = param.ListSelector(objects=['a', 'b', 'c', 'd'])
+
+        q = Q()
+        with self.assertRaises(ValueError):
+            q.r = 'ab'