mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-07 18:03:10 +00:00
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:
parent
daea7bcc34
commit
eec34b1f2a
1
changelog.d/11696.misc
Normal file
1
changelog.d/11696.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from.
|
@ -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__)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user