Fix key type error handling

Signed-off-by: Aleksei Stepanov <penguinolog@gmail.com>

Author: penguinolog

doc/source/ExecResult.rst

@@ -193,7 +193,7 @@ API: ExecResult
         :type item: typing.Union[int, slice, typing.Iterable[typing.Union[int, slice, ellipsis]]]
         :returns: Joined selected lines
         :rtype: str
-        :raises KeyError: Unexpected key
+        :raises TypeError: Unexpected key
 
     .. py:method:: __str__(self)
 

exec_helpers/exec_result.py

@@ -74,23 +74,25 @@ def __getitem__(self, item: typing.Union[int, slice, typing.Iterable[typing.Unio
         :type item: typing.Union[int, slice, typing.Iterable[typing.Union[int, slice, ellipsis]]]
         :returns: Joined selected lines
         :rtype: str
-        :raises KeyError: Unexpected key
+        :raises TypeError: Unexpected key
         """
         if isinstance(item, int):
             return _get_str_from_bin(_get_bytearray_from_array([self._data[item]]))
         if isinstance(item, slice):
             return _get_str_from_bin(_get_bytearray_from_array(self._data[item]))
-        buf: typing.List[bytes] = []
-        for rule in item:
-            if isinstance(rule, int):
-                buf.append(self._data[rule])
-            elif isinstance(rule, slice):
-                buf.extend(self._data[rule])
-            elif rule is Ellipsis:
-                buf.append(b"...\n")
-            else:
-                raise KeyError(f"Unexpected key: {rule!r} (from {item!r})")
-        return _get_str_from_bin(_get_bytearray_from_array(buf))
+        elif isinstance(item, tuple):
+            buf: typing.List[bytes] = []
+            for rule in item:
+                if isinstance(rule, int):
+                    buf.append(self._data[rule])
+                elif isinstance(rule, slice):
+                    buf.extend(self._data[rule])
+                elif rule is Ellipsis:
+                    buf.append(b"...\n")
+                else:
+                    raise TypeError(f"Unexpected key type: {rule!r} (from {item!r})")
+            return _get_str_from_bin(_get_bytearray_from_array(buf))
+        raise TypeError(f"Unexpected key type: {item!r}")
 
     def __len__(self) -> int:  # pragma: no cover
         """Data len."""

test/test_exec_result.py

@@ -264,5 +264,7 @@ def test_indexed_lines_access(self):
         self.assertEqual(result.stdout_lines[0, 2], 'line0\nline2')
         self.assertEqual(result.stdout_lines[0, ..., 2], 'line0\n...\nline2')
         self.assertEqual(result.stdout_lines[:1, ..., 2], 'line0\n...\nline2')
-        with self.assertRaises(KeyError):
+        with self.assertRaises(TypeError):
+            _ = result.stdout_lines['aaa']  # noqa
+        with self.assertRaises(TypeError):
             _ = result.stdout_lines[1, 'aaa']  # noqa