diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2021-12-07 13:51:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 13:51:11 +0000 |
| commit | 088d748f2cb51f03f3bcacc0fb3af1e0f9607737 (patch) | |
| tree | be04437420017f1954791a925a4bac1c92205c33 /synapse/config | |
| parent | Refactors in `_generate_sync_entry_for_rooms` (#11515) (diff) | |
| download | synapse-088d748f2cb51f03f3bcacc0fb3af1e0f9607737.tar.xz | |
Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (#11527)
This reverts commit a77c36989785c0d5565ab9a1169f4f88e512ce8a.
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/room_directory.py | 3 | ||||
| -rw-r--r-- | synapse/config/tls.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py index 3c5e0f7ce7..57316c59b6 100644 --- a/synapse/config/room_directory.py +++ b/synapse/config/room_directory.py @@ -15,9 +15,8 @@ from typing import List -from matrix_common.regex import glob_to_regex - from synapse.types import JsonDict +from synapse.util import glob_to_regex from ._base import Config, ConfigError diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 3e235b57a7..4ca111618f 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -16,12 +16,11 @@ import logging import os from typing import List, Optional, Pattern -from matrix_common.regex import glob_to_regex - from OpenSSL import SSL, crypto from twisted.internet._sslverify import Certificate, trustRootFromCertificates from synapse.config._base import Config, ConfigError +from synapse.util import glob_to_regex logger = logging.getLogger(__name__) |