-

cool-RR · cool-RR · commit 6ee3a52c1ef0 · 2014-10-19T00:02:59.000+03:00
diff --git a/source_py3/python_toolbox/combi/perming/perm.py b/source_py3/python_toolbox/combi/perming/perm.py
@@ -236,7 +236,15 @@ def unrapplied(self):
     )
 
     def __getitem__(self, i):
-        i_to_use = self.domain.index(i) if self.is_dapplied else i
+        if self.is_dapplied:
+            try:
+                i_to_use = self.domain.index(i)
+            except TypeError:
+                # Some types, like `str`, annoyingly raise `TypeError` instead
+                # of `IndexError`.
+                raise IndexError
+        else:
+            i_to_use = i
         return self._perm_sequence[i_to_use]
         
     length = property(
diff --git a/source_py3/test_python_toolbox/test_combi/test_perm_space.py b/source_py3/test_python_toolbox/test_combi/test_perm_space.py
@@ -267,10 +267,16 @@ def test_dapplied_perm_space():
                      '''<Perm: ('g', 'r', 'o', 'w', 'l') => (4, 3, 2, 1, 0)>'''
     
     assert dapplied_perm.index(4) == 'g'
-    
+        
     assert dapplied_perm.as_dictoid['g'] == 4
     assert dapplied_perm.items[0] == ('g', 4)
     
+    with cute_testing.RaiseAssertor(IndexError):
+        dapplied_perm[2]
+    with cute_testing.RaiseAssertor(IndexError):
+        dapplied_perm.as_dictoid[2]
+    with cute_testing.RaiseAssertor(ValueError):
+        dapplied_perm.index('x')
     
     # `__contains__` works on the values, not the keys:
     for char in 'growl':
