diff options
| author | reivilibre <oliverw@matrix.org> | 2022-03-10 15:53:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-10 15:53:23 +0000 |
| commit | 72e7f1c420b879a0a1ef1430771698b868693ab0 (patch) | |
| tree | 6ce478f37dd331c8af05fd0c3f2becbfd43cb185 /synapse/util | |
| parent | Support stable identifiers for MSC3440: Threading (#12151) (diff) | |
| download | synapse-72e7f1c420b879a0a1ef1430771698b868693ab0.tar.xz | |
Remove workaround introduced in Synapse v1.50.0rc1 for Mjolnir compatibility. Breaks compatibility with Mjolnir v1.3.1 and earlier. (#11700)
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/__init__.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 58b4220ff3..d8046b7553 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -31,13 +31,6 @@ from synapse.logging import context 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__) |