Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from. (#11696)

This commit is contained in:
reivilibre 2022-01-06 16:36:26 +00:00 committed by GitHub
parent daea7bcc34
commit eec34b1f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11696.misc Normal file
View File

@ -0,0 +1 @@
Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from.

7
synapse/util/__init__.py
View File

@ -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__)