From e4ce73cbba3318c865cf93c3a7e12ee2c8d9f65a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 17 Jul 2018 09:48:59 +0300 Subject: [PATCH] Revert Context iter changes in 87dc1a44b27f7828d0915886d7374d4252ee4fb7 and fix a f-string Closes #185 --- mautrix_telegram/context.py | 7 +++++-- mautrix_telegram/matrix.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/context.py b/mautrix_telegram/context.py index 5b0b6193..1324e5f1 100644 --- a/mautrix_telegram/context.py +++ b/mautrix_telegram/context.py @@ -38,7 +38,10 @@ class Context: self.session_container = session_container # type: AlchemySessionContainer self.public_website = public_website # type: PublicBridgeWebsite self.provisioning_api = provisioning_api # type: ProvisioningAPI - self.t = (self.az, self.db, self.config, self.loop, self.bot) def __iter__(self): - return iter(self.t) + yield self.az + yield self.db + yield self.config + yield self.loop + yield self.bot diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index 540fc39b..30604296 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -208,7 +208,7 @@ class MatrixHandler: self.log.debug(f"Ignoring message \"{message}\" from {sender} to {room}:" " User is not whitelisted.") return - self.log.debug("Received Matrix event \"{message}\" from {sender} in {room}") + self.log.debug(f"Received Matrix event \"{message}\" from {sender} in {room}") portal = Portal.get_by_mxid(room) if not is_command and portal and (await sender.is_logged_in() or portal.has_bot):