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/federation | |
| 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/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index cf067b56c6..ee71f289c8 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -28,6 +28,7 @@ from typing import ( Union, ) +from matrix_common.regex import glob_to_regex from prometheus_client import Counter, Gauge, Histogram from twisted.internet.abstract import isIPAddress @@ -65,7 +66,7 @@ from synapse.replication.http.federation import ( ) from synapse.storage.databases.main.lock import Lock from synapse.types import JsonDict, get_domain_from_id -from synapse.util import glob_to_regex, json_decoder, unwrapFirstError +from synapse.util import json_decoder, unwrapFirstError from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results from synapse.util.caches.response_cache import ResponseCache from synapse.util.stringutils import parse_server_name |