Revert "Work around Mjolnir compatibility issue by adding an import f…

…or `glob_to_regex` in `synapse.util`, where it moved from. (#11696)" This reverts commit eec34b1.
matrix-org · Jan 6, 2022 · 87c01ae · 87c01ae
1 parent e87540a
commit 87c01ae
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
@@ -31,13 +31,6 @@
 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__)