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

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

Merged
merged 2 commits into from
Jan 6, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7871fd2
Add import for glob_to_regex to work around Mjolnir compatibility issue
reivilibre Jan 6, 2022
30d0024
Newsfile
reivilibre Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11696.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from.
7 changes: 7 additions & 0 deletions synapse/util/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
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