Add Python 3.5 compatibility

mautrix_appservice/appservice.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # matrix-appservice-python - A Matrix Application Service framework written in Python.
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_appservice/errors.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_appservice/intent_api.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_appservice/state_store.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # matrix-appservice-python - A Matrix Application Service framework written in Python.
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/__main__.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/commands.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/config.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/db.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/formatter.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/matrix.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/portal.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #
@@ -564,12 +565,14 @@ class Portal:
         elif self.tgid:
             raise ValueError("Can't create Telegram chat for portal with existing Telegram chat.")
 
-        invites = await self._get_telegram_users_in_matrix_room()
+        invite_ids = await self._get_telegram_users_in_matrix_room()
-        if len(invites) < 2:
+        if len(invite_ids) < 2:
             # TODO[waiting-for-bots] This won't happen when the bot is enabled
             raise ValueError("Not enough Telegram users to create a chat")
 
-        invites = [await source.client.get_input_entity(id) for id in invites]
+        invites = []
+        for id in invite_ids:
+            invites.append(await source.client.get_input_entity(id))
 
         if self.peer_type == "chat":
             updates = await source.client(CreateChatRequest(title=self.title, users=invites))

mautrix_telegram/puppet.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/tgclient.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

mautrix_telegram/user.py

@@ -1,3 +1,4 @@
+# -*- coding: future_fstrings -*-
 # mautrix-telegram - A Matrix-Telegram puppeting bridge
 # Copyright (C) 2018 Tulir Asokan
 #

requirements.txt

@@ -3,6 +3,7 @@ ruamel.yaml
 python-magic
 SQLAlchemy
 alembic
--e git+https://github.com/LonamiWebs/Telethon@asyncio#egg=Telethon
+-e git+https://github.com/tulir/Telethon@asyncio-3.5#egg=Telethon
 Markdown
 Pillow
+future-fstrings

setup.py

@@ -21,10 +21,11 @@ setuptools.setup(
         "Markdown>=2.6.11,<3",
         "ruamel.yaml>=0.15.35,<0.16",
         "Pillow>=5.0.0,<6",
+        "future-fstrings>=0.4.1",
         "python-magic>=0.4.15,<0.5",
     ],
     dependency_links=[
-        "https://github.com/LonamiWebs/Telethon/tarball/7da092894b306d720cc60c04daa2bfba58f81946#egg=Telethon"
+        "https://github.com/tulir/Telethon/tarball/ac46abc9680c5a74897fe6dbe9e585ad2577b1fa#egg=Telethon"
     ],
 
     classifiers=[