summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-14 14:19:23 +0000
committerErik Johnston <erik@matrix.org>2018-03-14 14:19:23 +0000
commit0011ede3b0ba9de22af3bb36c300b6779918bfa1 (patch)
tree0fd60b27cc3a09e1aa840c697e970c7868cc373a /synapse
parents/join/joined/ in notify_user_membership_change (diff)
downloadsynapse-0011ede3b0ba9de22af3bb36c300b6779918bfa1.tar.xz
Fix imports
Diffstat (limited to 'synapse')
-rw-r--r--synapse/replication/http/__init__.py5
-rw-r--r--synapse/replication/http/membership.py6
2 files changed, 4 insertions, 7 deletions
diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py
index 7a148301de..1d7a607529 100644
--- a/synapse/replication/http/__init__.py
+++ b/synapse/replication/http/__init__.py
@@ -13,11 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-import send_event
-import membership
-
 from synapse.http.server import JsonResource
+from synapse.replication.http import membership, send_event
 
 
 REPLICATION_PREFIX = "/_synapse/replication"
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py
index fcd038a8a2..e66c4e881f 100644
--- a/synapse/replication/http/membership.py
+++ b/synapse/replication/http/membership.py
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
+import re
+
 from twisted.internet import defer
 
 from synapse.api.errors import SynapseError, MatrixCodeMessageException
@@ -20,9 +23,6 @@ from synapse.http.servlet import RestServlet, parse_json_object_from_request
 from synapse.types import Requester, UserID
 from synapse.util.distributor import user_left_room, user_joined_room
 
-import logging
-import re
-
 logger = logging.getLogger(__name__)