summary refs log tree commit diff
diff options
context:
space:
mode:
authorJason Robinson <jasonr@element.io>2021-07-27 18:34:15 +0300
committerGitHub <noreply@github.com>2021-07-27 11:34:15 -0400
commit31c6b30dd425909d188695e65921e48235f41064 (patch)
tree083c9e8749526686bf8e712dd033f5c788e5d7a5
parentFix typo that causes R30v2 to actually be old R30 (#10486) (diff)
downloadsynapse-31c6b30dd425909d188695e65921e48235f41064.tar.xz
Fix import of the default SAML mapping provider. (#10477)
Fix a circular import, which was causing exceptions on boot if SAML
was configured.
-rw-r--r--changelog.d/10477.bugfix1
-rw-r--r--synapse/handlers/_base.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog.d/10477.bugfix b/changelog.d/10477.bugfix
new file mode 100644
index 0000000000..bcc92de434
--- /dev/null
+++ b/changelog.d/10477.bugfix
@@ -0,0 +1 @@
+Fix bug introduced in Synapse 1.38 which caused an exception at startup when SAML authentication was enabled.
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 525f3d39b1..6a05a65305 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -15,8 +15,6 @@
 import logging
 from typing import TYPE_CHECKING, Optional
 
-import synapse.state
-import synapse.storage
 import synapse.types
 from synapse.api.constants import EventTypes, Membership
 from synapse.api.ratelimiting import Ratelimiter