From eec34b1f2a53af45807cb718a26861be3f2fd43c Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@matrix.org>
Date: Thu, 6 Jan 2022 16:36:26 +0000
Subject: Work around Mjolnir compatibility issue by adding an import for
 `glob_to_regex` in `synapse.util`, where it moved from. (#11696)

---
 synapse/util/__init__.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'synapse/util')

diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index f157132210..511f52534b 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -31,6 +31,13 @@ from synapse.logging import context
 if typing.TYPE_CHECKING:
     pass
 
+# FIXME Mjolnir imports glob_to_regex from this file, but it was moved to
+#       matrix_common.
+#       As a temporary workaround, we import glob_to_regex here for
+#       compatibility with current versions of Mjolnir.
+# See https://github.com/matrix-org/mjolnir/pull/174
+from matrix_common.regex import glob_to_regex  # noqa
+
 logger = logging.getLogger(__name__)
 
 
-- 
cgit 1.5.1