From 31c6b30dd425909d188695e65921e48235f41064 Mon Sep 17 00:00:00 2001
From: Jason Robinson <jasonr@element.io>
Date: Tue, 27 Jul 2021 18:34:15 +0300
Subject: [PATCH] Fix import of the default SAML mapping provider. (#10477)

Fix a circular import, which was causing exceptions on boot if SAML
was configured.
---
 changelog.d/10477.bugfix  | 1 +
 synapse/handlers/_base.py | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 changelog.d/10477.bugfix

diff --git a/changelog.d/10477.bugfix b/changelog.d/10477.bugfix
new file mode 100644
index 000000000..bcc92de43
--- /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 525f3d39b..6a05a6530 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