Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Revert "Work around Mjolnir compatibility issue by adding an import f…
Browse files Browse the repository at this point in the history
…or `glob_to_regex` in `synapse.util`, where it moved from. (#11696)"

This reverts commit eec34b1.
  • Loading branch information
reivilibre committed Jan 6, 2022
1 parent e87540a commit 87c01ae
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions synapse/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)


Expand Down

0 comments on commit 87c01ae

Please sign in to comment.