Merge pull request #68 from tulir/python3.5

Re-add Python 3.5 support to master

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/auth.py

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

mautrix_telegram/commands/clean_rooms.py

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

mautrix_telegram/commands/handler.py

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

mautrix_telegram/commands/meta.py

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

mautrix_telegram/commands/telegram.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
 #

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/3.5.txt

@@ -0,0 +1,2 @@
+-r base.txt
+-e git+https://github.com/tulir/Telethon@asyncio-3.5#egg=Telethon

requirements/base.txt

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

requirements/default.txt

@@ -0,0 +1,2 @@
+-r base.txt
+-e git+https://github.com/LonamiWebs/Telethon@asyncio#egg=Telethon

setup.py

@@ -1,4 +1,5 @@
 import setuptools
+import sys
 import mautrix_telegram
 
 setuptools.setup(
@@ -21,10 +22,14 @@ 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/LonamiWebs/Telethon/tarball/7da092894b306d720cc60c04daa2bfba58f81946#egg=Telethon"
+            if sys.version_info.major > 3 or sys.version_info.minor > 5
+            else "https://github.com/tulir/Telethon/tarball/ac46abc9680c5a74897fe6dbe9e585ad2577b1fa#egg=Telethon")
     ],
 
     classifiers=[