Fix key type error handling

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

(cherry picked from commit bae0196)
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:: __unicode__(self)
 

exec_helpers/exec_result.py

@@ -82,23 +82,25 @@ def __getitem__(
         :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, six.integer_types):
             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 = []  # type: typing.List[bytes]
-        for rule in item:
-            if isinstance(rule, six.integer_types):
-                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("Unexpected key: {rule!r} (from {item!r})".format(rule=rule, item=item))
-        return _get_str_from_bin(_get_bytearray_from_array(buf))
+        if isinstance(item, tuple):
+            buf = []  # type: typing.List[bytes]
+            for rule in item:
+                if isinstance(rule, six.integer_types):
+                    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("Unexpected key type: {rule!r} (from {item!r})".format(rule=rule, item=item))
+            return _get_str_from_bin(_get_bytearray_from_array(buf))
+        raise TypeError("Unexpected key type: {item!r}".format(item=item))
 
     def __len__(self):  # type: () -> int  # pragma: no cover
         """Data len."""

test/test_exec_result.py

@@ -265,37 +265,39 @@ def test_indexed_lines_access(self):
         result = exec_helpers.ExecResult(
             cmd,
             stdout=(
-                b'line0\n',
-                b'line1\n',
-                b'line2\n',
-                b'line3\n',
-                b'line4\n',
-                b'line5\n',
-                b'line6\n',
-                b'line7\n',
-                b'line8\n',
-                b'line9\n',
+                b"line0\n",
+                b"line1\n",
+                b"line2\n",
+                b"line3\n",
+                b"line4\n",
+                b"line5\n",
+                b"line6\n",
+                b"line7\n",
+                b"line8\n",
+                b"line9\n",
             ),
             stderr=(
-                b'e_line0\n',
-                b'e_line1\n',
-                b'e_line2\n',
-                b'e_line3\n',
-                b'e_line4\n',
-                b'e_line5\n',
-                b'e_line6\n',
-                b'e_line7\n',
-                b'e_line8\n',
-                b'e_line9\n',
-            )
+                b"e_line0\n",
+                b"e_line1\n",
+                b"e_line2\n",
+                b"e_line3\n",
+                b"e_line4\n",
+                b"e_line5\n",
+                b"e_line6\n",
+                b"e_line7\n",
+                b"e_line8\n",
+                b"e_line9\n",
+            ),
         )
 
         self.assertEqual(result.stdout_lines[:], result.stdout_str)
         self.assertEqual(result.stderr_lines[:], result.stderr_str)
-        self.assertEqual(result.stdout_lines[0], 'line0')
-        self.assertEqual(result.stdout_lines[0, 1], 'line0\nline1')
-        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):
-            _ = result.stdout_lines[1, 'aaa']  # noqa
+        self.assertEqual(result.stdout_lines[0], "line0")
+        self.assertEqual(result.stdout_lines[0, 1], "line0\nline1")
+        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(TypeError):
+            _ = result.stdout_lines["aaa"]  # noqa
+        with self.assertRaises(TypeError):
+            _ = result.stdout_lines[1, "aaa"]  # noqa