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

Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. #11700

Merged
merged 7 commits into from
Mar 10, 2022
Merged

Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. #11700

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87c01ae
Revert "Work around Mjolnir compatibility issue by adding an import f…
reivilibre Jan 6, 2022
2d940c2
Newsfile
reivilibre Jan 6, 2022
c8dcc8b
Merge branch 'develop' into rei/revert_mjolnir_hotfix
reivilibre Mar 2, 2022
ef00663
Merge branch 'develop' into rei/revert_mjolnir_hotfix
reivilibre Mar 9, 2022
36592d7
Update Upgrade notes to mention Mjolnir compatibility
reivilibre Mar 9, 2022
246cd39
Fix newsfile version numbers
reivilibre Mar 9, 2022
b23c604
Update upgrade.md
reivilibre Mar 10, 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/11700.removal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.2.1 and earlier.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, maybe we should make a note of it in the upgrade notes? wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the notes, do you think they're good?

7 changes: 0 additions & 7 deletions synapse/util/__init__.py
View file
Open in desktop
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