From 63070624f6ca44a688186d3bfb896ea874a8e6de Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 29 Jan 2018 19:38:19 +0200
Subject: [PATCH] Use concatenation with f-strings in parantheses for
 future-fstrings compatibility

---
 mautrix_telegram/commands.py  | 10 +++++-----
 mautrix_telegram/formatter.py |  6 +++---
 mautrix_telegram/matrix.py    | 13 +++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mautrix_telegram/commands.py b/mautrix_telegram/commands.py
index 0e5bab9a..2f3a8675 100644
--- a/mautrix_telegram/commands.py
+++ b/mautrix_telegram/commands.py
@@ -48,7 +48,7 @@ class CommandHandler:
             except:
                 self.reply("Fatal error while handling command. Check logs for more details.")
                 self.log.exception(f"Fatal error handling command "
-                                   f"'$cmdprefix {command} {''.join(args)}' from {sender.mxid}")
+                                   + f"'$cmdprefix {command} {''.join(args)}' from {sender.mxid}")
 
     @contextmanager
     def handler(self, sender, room, command, args, is_management, is_portal):
@@ -297,14 +297,14 @@ class CommandHandler:
         elif (not levels or not levels["users"] or self.az.intent.mxid not in levels["users"] or
               levels["users"][self.az.intent.mxid] < 100):
             return self.reply(f"Please give "
-                              f"[the bridge bot](https://matrix.to/#/{self.az.intent.mxid}) "
-                              f"a power level of 100 before creating a Telegram chat.")
+                              + f"[the bridge bot](https://matrix.to/#/{self.az.intent.mxid}) "
+                              + f"a power level of 100 before creating a Telegram chat.")
         else:
             for user, level in levels["users"].items():
                 if level >= 100 and user != self.az.intent.mxid:
                     return self.reply(f"Please make sure only the bridge bot has power level above"
-                                      f"99 before creating a Telegram chat.\n\n"
-                                      f"Use power level 95 instead of 100 for admins.")
+                                      + f"99 before creating a Telegram chat.\n\n"
+                                      + f"Use power level 95 instead of 100 for admins.")
 
         supergroup = type == "supergroup"
         types = {
diff --git a/mautrix_telegram/formatter.py b/mautrix_telegram/formatter.py
index 428ed41a..38f62d39 100644
--- a/mautrix_telegram/formatter.py
+++ b/mautrix_telegram/formatter.py
@@ -214,7 +214,7 @@ def telegram_event_to_matrix(evt, source):
         if not fwd_from:
             fwd_from = "Unknown user"
         html = (f"Forwarded message from <b>{fwd_from}</b><br/>"
-                f"<blockquote>{html}</blockquote>")
+                + f"<blockquote>{html}</blockquote>")
 
     if evt.reply_to_msg_id:
         msg = DBMessage.query.get((evt.reply_to_msg_id, source.tgid))
@@ -261,8 +261,8 @@ def _telegram_to_matrix(text, entities):
         elif entity_type == MessageEntityPre:
             if entity.language:
                 html.append("<pre>"
-                            f"<code class='language-{entity.language}'>{entity_text}</code>"
-                            "</pre>")
+                            + f"<code class='language-{entity.language}'>{entity_text}</code>"
+                            + "</pre>")
             else:
                 html.append(f"<pre><code>{entity_text}</code></pre>")
         elif entity_type == MessageEntityMention:
diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py
index 69aa96cf..a30cd99d 100644
--- a/mautrix_telegram/matrix.py
+++ b/mautrix_telegram/matrix.py
@@ -65,8 +65,8 @@ class MatrixHandler:
             if len(members) > 1:
                 puppet.intent.error_and_leave(room, text=None, html=(
                     f"Please invite "
-                    f"<a href='https://matrix.to/#/{self.az.intent.mxid}'>the bridge bot</a> "
-                    f"first if you want to create a Telegram chat."))
+                    + f"<a href='https://matrix.to/#/{self.az.intent.mxid}'>the bridge bot</a> "
+                    + f"first if you want to create a Telegram chat."))
                 return
 
             puppet.intent.join_room(room)
@@ -76,15 +76,16 @@ class MatrixHandler:
                     puppet.intent.invite(existing_portal.mxid, inviter.mxid)
                     puppet.intent.send_notice(room, text=None, html=(
                         "You already have a private chat with me: "
-                        f"<a href='https://matrix.to/#/{existing_portal.mxid}'>"
-                        "Link to room"
-                        "</a>"))
+                        + f"<a href='https://matrix.to/#/{existing_portal.mxid}'>"
+                        + "Link to room"
+                        + "</a>"))
                     puppet.intent.leave_room(room)
                     return
                 except MatrixRequestError:
                     existing_portal.delete()
 
-            portal = Portal(tgid=puppet.tgid, tg_receiver=inviter.tgid, peer_type="user", mxid=room)
+            portal = Portal(tgid=puppet.tgid, tg_receiver=inviter.tgid, peer_type="user",
+                            mxid=room)
             portal.save()
             puppet.intent.send_notice(room, "Portal to private chat created.")
         else: