From 48665acf1d16cc1e7abbfd17aa8b12790398508a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 13 Jul 2018 22:14:04 +0300 Subject: [PATCH] Fix imports and other mistakes --- mautrix_telegram/web/provisioning/__init__.py | 3 ++- mautrix_telegram/web/public/__init__.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mautrix_telegram/web/provisioning/__init__.py b/mautrix_telegram/web/provisioning/__init__.py index c2f087a9..f5d56c5e 100644 --- a/mautrix_telegram/web/provisioning/__init__.py +++ b/mautrix_telegram/web/provisioning/__init__.py @@ -17,6 +17,7 @@ from aiohttp import web import logging +from ...user import User from ..common import AuthAPI @@ -24,7 +25,7 @@ class ProvisioningAPI(AuthAPI): log = logging.getLogger("mau.web.provisioning") def __init__(self, loop): - super(AuthAPI, self).__init__(loop) + super().__init__(loop) self.app = web.Application(loop=loop) diff --git a/mautrix_telegram/web/public/__init__.py b/mautrix_telegram/web/public/__init__.py index 43738d8e..eab1f5fe 100644 --- a/mautrix_telegram/web/public/__init__.py +++ b/mautrix_telegram/web/public/__init__.py @@ -27,16 +27,16 @@ class PublicBridgeWebsite(AuthAPI): log = logging.getLogger("mau.web.public") def __init__(self, loop): - super(AuthAPI, self).__init__(loop) + super().__init__(loop) self.login = Template( - pkg_resources.resource_string("mautrix_telegram", "public/login.html.mako")) + pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako")) self.app = web.Application(loop=loop) self.app.router.add_route("GET", "/login", self.get_login) self.app.router.add_route("POST", "/login", self.post_login) - self.app.router.add_static("/", - pkg_resources.resource_filename("mautrix_telegram", "public/")) + self.app.router.add_static("/", pkg_resources.resource_filename("mautrix_telegram", + "web/public/")) async def get_login(self, request): state = "token" if request.rel_url.query.get("mode", "") == "bot" else "request"