diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2021-12-06 11:36:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-06 11:36:08 +0000 |
| commit | a77c36989785c0d5565ab9a1169f4f88e512ce8a (patch) | |
| tree | d3f095c83192afb66d4b33113a473e4d2d7ddbf5 /synapse/config | |
| parent | Update backward extremity docs to make it clear that it does not indicate whe... (diff) | |
| download | synapse-a77c36989785c0d5565ab9a1169f4f88e512ce8a.tar.xz | |
Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)
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, 4 insertions, 2 deletions
diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py index 57316c59b6..3c5e0f7ce7 100644 --- a/synapse/config/room_directory.py +++ b/synapse/config/room_directory.py @@ -15,8 +15,9 @@ 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 4ca111618f..3e235b57a7 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -16,11 +16,12 @@ 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__) |