Merge 359fa4a into 57c1701

param/__init__.py

@@ -1335,8 +1335,11 @@ def get_range(self):
         Only classes from modules that have been imported are added
         (see concrete_descendents()).
         """
-        classes = concrete_descendents(self.class_)
-        d=OrderedDict((name,class_) for name,class_ in classes.items())
+        classes = self.class_ if isinstance(self.class_, tuple) else (self.class_,)
+        all_classes = {}
+        for cls in classes:
+            all_classes.update(concrete_descendents(cls))
+        d=OrderedDict((name,class_) for name,class_ in all_classes.items())
         if self.allow_None:
             d['None']=None
         return d

tests/API1/testclassselector.py

@@ -60,6 +60,12 @@ def test_multiple_class_type_constructor2(self):
         p = self.P(h=str)
         self.assertEqual(p.h, str)
 
+    def test_class_selector_get_range(self):
+        p = self.P()
+        classes = p.param.g.get_range()
+        self.assertIn('int', classes)
+        self.assertIn('str', classes)
+
     def test_multiple_class_type_error(self):
         exception = "Parameter 'float' must be a subclass of \(int, str\), not 'type'"
         with self.assertRaisesRegexp(ValueError, exception):