Skip to content
Snippets Groups Projects
Unverified Commit eec34b1f authored by reivilibre's avatar reivilibre Committed by GitHub
Browse files

Work around Mjolnir compatibility issue by adding an import for...

Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from. (#11696)
parent daea7bcc
No related branches found
No related tags found
No related merge requests found
Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from.
\ No newline at end of file
...@@ -31,6 +31,13 @@ from synapse.logging import context ...@@ -31,6 +31,13 @@ from synapse.logging import context
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
pass 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__) logger = logging.getLogger(__name__)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment