summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-02-16 04:35:27 +1100
committerAmber Brown <hawkowl@atleastfornow.net>2019-02-16 04:35:27 +1100
commit7b5c04312efd0829855a45b19839971c55f81599 (patch)
tree0ca48425d3a0fcbe6631febf3db2fdb2deba0652
parentadd cache remover endpoint and wire it up (diff)
downloadsynapse-7b5c04312efd0829855a45b19839971c55f81599.tar.xz
isort
-rw-r--r--synapse/handlers/user_directory.py1
-rw-r--r--synapse/replication/http/__init__.py2
-rw-r--r--synapse/rest/client/v2_alpha/register.py4
3 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py

index f5c3ba23a6..0dacd9e357 100644 --- a/synapse/handlers/user_directory.py +++ b/synapse/handlers/user_directory.py
@@ -14,7 +14,6 @@ # limitations under the License. import logging -import synapse.metrics from six import iteritems diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py
index f46a580be2..3807d2ac6f 100644 --- a/synapse/replication/http/__init__.py +++ b/synapse/replication/http/__init__.py
@@ -14,7 +14,7 @@ # limitations under the License. from synapse.http.server import JsonResource -from synapse.replication.http import federation, membership, send_event, registration +from synapse.replication.http import federation, membership, registration, send_event REPLICATION_PREFIX = "/_synapse/replication" diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 35319f7a79..ca9a850817 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py
@@ -24,7 +24,6 @@ from twisted.internet import defer import synapse import synapse.types -from synapse.replication.http.registration import RegistrationUserCacheInvalidationServlet from synapse.api.constants import LoginType from synapse.api.errors import Codes, SynapseError, UnrecognizedRequestError from synapse.config.server import is_threepid_reserved @@ -34,6 +33,9 @@ from synapse.http.servlet import ( parse_json_object_from_request, parse_string, ) +from synapse.replication.http.registration import ( + RegistrationUserCacheInvalidationServlet, +) from synapse.util.msisdn import phone_number_to_msisdn from synapse.util.ratelimitutils import FederationRateLimiter from synapse.util.threepids import check_3pid_allowed