pep/slixmpp-omemo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

echo_bot: use f-strings where possible

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2022-03-12 01:23:43 +01:00
parent 31380cd726
commit a495d7d7c8
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
examples/echo_client.py
View file

@ -101,9 +101,9 @@ class EchoBot(ClientXMPP):
body = ( body = (
'I\'m the slixmpp-omemo echo bot! ' 'I\'m the slixmpp-omemo echo bot! '
'The following commands are available:\n' 'The following commands are available:\n'
'{prefix}verbose Send message or reply with log messages\n' f'{self.cmd_prefix}verbose Send message or reply with log messages\n'
'{prefix}error Send message or reply only on error\n' f'{self.cmd_prefix}error Send message or reply only on error\n'
).format(prefix=self.cmd_prefix) )
return await self.encrypted_reply(mto, mtype, body) return await self.encrypted_reply(mto, mtype, body)
async def cmd_verbose(self, mto: JID, mtype: str) -> None: async def cmd_verbose(self, mto: JID, mtype: str) -> None:
@ -136,7 +136,7 @@ class EchoBot(ClientXMPP):
if not self['xep_0384'].is_encrypted(msg): if not self['xep_0384'].is_encrypted(msg):
if self.debug_level == LEVEL_DEBUG: if self.debug_level == LEVEL_DEBUG:
await self.plain_reply(mto, mtype, 'Echo unencrypted message:%(body)s' % msg) await self.plain_reply(mto, mtype, f"Echo unencrypted message:{msg['body']}")
return None return None
try: try:
@ -151,7 +151,7 @@ class EchoBot(ClientXMPP):
if self.is_command(decoded): if self.is_command(decoded):
await self.handle_command(mto, mtype, decoded) await self.handle_command(mto, mtype, decoded)
elif self.debug_level == LEVEL_DEBUG: elif self.debug_level == LEVEL_DEBUG:
await self.encrypted_reply(mto, mtype, 'Echo: %s' % decoded) await self.encrypted_reply(mto, mtype, f'Echo: {decoded}')
return None return None
except (MissingOwnKey,): except (MissingOwnKey,):
# The message is missing our own key, it was not encrypted for # The message is missing our own key, it was not encrypted for
@ -185,7 +185,7 @@ class EchoBot(ClientXMPP):
# anyway. # anyway.
await self.plain_reply( await self.plain_reply(
mto, mtype, mto, mtype,
"Error: Your device '%s' is not in my trusted devices." % exn.device, f"Error: Your device '{exn.device}' is not in my trusted devices.",
) )
# We resend, setting the `allow_untrusted` parameter to True. # We resend, setting the `allow_untrusted` parameter to True.
await self.message_handler(msg, allow_untrusted=True) await self.message_handler(msg, allow_untrusted=True)
@ -260,8 +260,8 @@ class EchoBot(ClientXMPP):
# point can bring up the issue if it happens. # point can bring up the issue if it happens.
self.plain_reply( self.plain_reply(
mto, mtype, mto, mtype,
'Could not find keys for device "%d" of recipient "%s". Skipping.' % f'Could not find keys for device "{error.device}"'
(error.device, error.bare_jid), f' of recipient "{error.bare_jid}". Skipping.',
) )
jid = JID(error.bare_jid) jid = JID(error.bare_jid)
device_list = expect_problems.setdefault(jid, []) device_list = expect_problems.setdefault(jid, [])