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/federation/federation_server.py | |
| 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/federation/federation_server.py')
| -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 8e37e76206..4697a62c18 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 import defer @@ -66,7 +67,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 from synapse.util.caches.response_cache import ResponseCache from synapse.util.stringutils import parse_server_name |