summaryrefslogtreecommitdiff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2021-03-12 08:45:19 +0100
committerAndrej Shadura <andrewsh@debian.org>2021-03-12 08:45:19 +0100
commita164b24227153a3ffe4d9adbb9bb1c1e981efe39 (patch)
tree4b9353cc412efe3dc135c7dda83e0fb7af64680b /synapse/handlers/auth.py
parent7b07dc8dd1aa7eb4c55edb19822a30cfdc4adc0b (diff)
New upstream version 1.29.0
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r--synapse/handlers/auth.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index 9ba9f591..3978e415 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -36,7 +36,7 @@ import attr
import bcrypt
import pymacaroons
-from twisted.web.http import Request
+from twisted.web.server import Request
from synapse.api.constants import LoginType
from synapse.api.errors import (
@@ -481,7 +481,7 @@ class AuthHandler(BaseHandler):
sid = authdict["session"]
# Convert the URI and method to strings.
- uri = request.uri.decode("utf-8")
+ uri = request.uri.decode("utf-8") # type: ignore
method = request.method.decode("utf-8")
# If there's no session ID, create a new session.