diff options
| author | reivilibre <oliverw@matrix.org> | 2022-01-05 11:41:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 11:41:49 +0000 |
| commit | 84bfe47b01402cf037417f0026ed4077223ed259 (patch) | |
| tree | 91459a8f2f39807559e364e40bd1c17958ea8321 /synapse/config/tls.py | |
| parent | Clarify SSO mapping provider documentation by writing `def` or `async def` be... (diff) | |
| download | synapse-84bfe47b01402cf037417f0026ed4077223ed259.tar.xz | |
Re-apply: Move glob_to_regex and re_word_boundary to matrix-python-common #11505 (#11687)
Co-authored-by: Sean Quah <seanq@element.io>
Diffstat (limited to 'synapse/config/tls.py')
| -rw-r--r-- | synapse/config/tls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py index ffb316e4c0..6e673d65a7 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__) |