Work around Mjolnir compatibility issue by adding an import for `glob…

…_to_regex` in `synapse.util`, where it moved from. (#11696)
matrix-org · Jan 6, 2022 · eec34b1 · eec34b1
1 parent daea7bc
commit eec34b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/changelog.d/11696.misc b/changelog.d/11696.misc
@@ -0,0 +1 @@
+Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from.
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
@@ -31,6 +31,13 @@
 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__)