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/federation/federation_server.py | |
| 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/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 4697a62c18..8e37e76206 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -28,7 +28,6 @@ from typing import ( Union, ) -from matrix_common.regex import glob_to_regex from prometheus_client import Counter, Gauge, Histogram from twisted.internet import defer @@ -67,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 json_decoder, unwrapFirstError +from synapse.util import glob_to_regex, 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 |