Use TraceLogger in type hints and fix some other things

Author: tulir

mautrix/bridge/bridge.py

@@ -4,7 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from typing import Optional, Type
-from itertools import chain
 import sys
 
 import sqlalchemy as sql

mautrix/bridge/portal.py

@@ -10,13 +10,14 @@
 
 from mautrix.appservice import AppService, IntentAPI
 from mautrix.types import RoomID, EventID, MessageEventContent
+from mautrix.util.logging import TraceLogger
 
 if TYPE_CHECKING:
     from .user import BaseUser
 
 
 class BasePortal(ABC):
-    log: logging.Logger = logging.getLogger("mau.portal")
+    log: TraceLogger = logging.getLogger("mau.portal")
     az: AppService
     loop: asyncio.AbstractEventLoop
     main_intent: IntentAPI

mautrix/bridge/puppet.py

@@ -10,6 +10,7 @@
 
 from mautrix.types import UserID
 from mautrix.appservice import AppService, IntentAPI
+from mautrix.util.logging import TraceLogger
 
 from .custom_puppet import CustomPuppetMixin
 
@@ -18,7 +19,7 @@
 
 
 class BasePuppet(CustomPuppetMixin, ABC):
-    log: logging.Logger = logging.getLogger("mau.puppet")
+    log: TraceLogger = logging.getLogger("mau.puppet")
     az: AppService
     loop: asyncio.AbstractEventLoop
     mx: 'BaseMatrixHandler'

mautrix/bridge/user.py

@@ -10,10 +10,11 @@
 
 from mautrix.appservice import AppService
 from mautrix.types import UserID
+from mautrix.util.logging import TraceLogger
 
 
 class BaseUser(ABC):
-    log: logging.Logger = logging.getLogger("mau.user")
+    log: TraceLogger = logging.getLogger("mau.user")
     az: AppService
     loop: asyncio.AbstractEventLoop
 

mautrix/client/api/types/event/state.py

@@ -104,7 +104,7 @@ class RoomTopicStateEventContent(SerializableAttrs['RoomTopicStateEventContent']
 
 @dataclass
 class RoomAvatarStateEventContent(SerializableAttrs['RoomAvatarStateEventContent']):
-    url: ContentURI = None
+    url: Optional[ContentURI] = None
 
 
 @dataclass