Add missing type hints and fix most type errors except for Optionals.

mautrix_telegram/formatter/from_matrix/parser_htmlparser.py

@@ -80,12 +80,12 @@ class MatrixParser(HTMLParser, MatrixParserCommon):
             args["url"] = url
             return MessageEntityTextUrl, None
 
-    def handle_starttag(self, tag: str, attrs: List[Tuple[str, str]]):
+    def handle_starttag(self, tag: str, attrs_list: List[Tuple[str, str]]):
         self._open_tags.appendleft(tag)
         self._open_tags_meta.appendleft(0)
 
-        attrs = dict(attrs)
-        entity_type = None  # type: type(TypeMessageEntity)
+        attrs = dict(attrs_list)
+        entity_type = None  # type: Optional[Type[TypeMessageEntity]]
         args = {}  # type: Dict[str, Any]
         if tag in ("strong", "b"):
             entity_type = MessageEntityBold

mautrix_telegram/formatter/from_matrix/parser_lxml.py

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-from typing import Optional, List, Tuple, Union, Callable
+from typing import Callable, List, Optional, Sequence, Tuple, Type, Union
 from lxml import html
 
 from telethon.tl.types import (MessageEntityMention as Mention,
@@ -83,7 +83,7 @@ def offset_length_multiply(amount: int):
 
 
 class TelegramMessage:
-    def __init__(self, text: str = "", entities: Optional[List[TypeMessageEntity]] = None):
+    def __init__(self, text: str = "", entities: Optional[List[TypeMessageEntity]] = None) -> None:
         self.text = text  # type: str
         self.entities = entities or []  # type: List[TypeMessageEntity]
 
@@ -120,7 +120,7 @@ class TelegramMessage:
             self.text = msg.text + self.text
         return self
 
-    def format(self, entity_type: type(TypeMessageEntity), offset: int = None, length: int = None,
+    def format(self, entity_type: Type[TypeMessageEntity], offset: int = None, length: int = None,
                **kwargs) -> "TelegramMessage":
         self.entities.append(entity_type(offset=offset or 0,
                                          length=length if length is not None else len(self.text),
@@ -158,7 +158,8 @@ class TelegramMessage:
         return output
 
     @staticmethod
-    def join(items: List[Union[str, "TelegramMessage"]], separator: str = " ") -> "TelegramMessage":
+    def join(items: Sequence[Union[str, "TelegramMessage"]],
+             separator: str = " ") -> "TelegramMessage":
         main = TelegramMessage()
         for msg in items:
             if isinstance(msg, str):