!squash more

Author: tony

libtmux/common.py

@@ -13,7 +13,17 @@
 import typing as t
 from collections.abc import MutableMapping
 from distutils.version import LooseVersion
-from typing import Any, Dict, Generic, List, Optional, TypeVar, Union, overload
+from typing import (
+    Any,
+    Dict,
+    Generic,
+    KeysView,
+    List,
+    Optional,
+    TypeVar,
+    Union,
+    overload,
+)
 
 from . import exc
 from ._compat import console_to_str, str_from_console
@@ -248,6 +258,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
             returncode = self.process.returncode
         except Exception as e:
             logger.error(f"Exception for {subprocess.list2cmdline(cmd)}: \n{e}")
+            raise
 
         self.returncode = returncode
 
@@ -287,31 +298,38 @@ class TmuxMappingObject(MutableMapping[t.Any, t.Any]):
     ================ ================================== ==============
     """
     _info: t.Dict[t.Any, t.Any]
+    formatter_prefix: str
 
     def __getitem__(self, key: str) -> str:
-        return self._info[key]
+        item = self._info[key]
+        assert item is not None
+        assert isinstance(item, str)
+        return item
 
     def __setitem__(self, key: str, value: str) -> None:
         self._info[key] = value
         self.dirty = True
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: str) -> None:
         del self._info[key]
         self.dirty = True
 
-    def keys(self):
+    def keys(self) -> KeysView[str]:
         """Return list of keys."""
         return self._info.keys()
 
-    def __iter__(self):
+    def __iter__(self) -> t.Iterator[str]:
         return self._info.__iter__()
 
     def __len__(self) -> int:
         return len(self._info.keys())
 
     def __getattr__(self, key: str) -> str:
         try:
-            return self._info[self.formatter_prefix + key]
+            val = self._info[self.formatter_prefix + key]
+            assert val is not None
+            assert isinstance(val, str)
+            return val
         except KeyError:
             raise AttributeError(f"{self.__class__} has no property {key}")