summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-20 13:47:56 +0000
committerErik Johnston <erik@matrix.org>2017-03-20 13:47:56 +0000
commitaac6d1fc9b376ce0f1cd4df06f10f41e250db77f (patch)
tree8fcb5ee72a55e22f8af35cfb73a6c1e6570bb3f2
parentDon't send the full event json over replication (diff)
downloadsynapse-aac6d1fc9b376ce0f1cd4df06f10f41e250db77f.tar.xz
PEP8
-rw-r--r--synapse/app/synchrotron.py1
-rw-r--r--synapse/replication/slave/storage/events.py2
2 files changed, 0 insertions, 3 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
index c75b7c04cd..9f93b311d1 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -20,7 +20,6 @@ from synapse.api.constants import EventTypes, PresenceState
 from synapse.config._base import ConfigError
 from synapse.config.homeserver import HomeServerConfig
 from synapse.config.logger import setup_logging
-from synapse.events import FrozenEvent
 from synapse.handlers.presence import PresenceHandler
 from synapse.http.site import SynapseSite
 from synapse.http.server import JsonResource
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py
index a513165a14..a1e1e54e5b 100644
--- a/synapse/replication/slave/storage/events.py
+++ b/synapse/replication/slave/storage/events.py
@@ -16,7 +16,6 @@ from ._base import BaseSlavedStore
 from ._slaved_id_tracker import SlavedIdTracker
 
 from synapse.api.constants import EventTypes
-from synapse.events import FrozenEvent
 from synapse.storage import DataStore
 from synapse.storage.roommember import RoomMemberStore
 from synapse.storage.event_federation import EventFederationStore
@@ -25,7 +24,6 @@ from synapse.storage.state import StateStore
 from synapse.storage.stream import StreamStore
 from synapse.util.caches.stream_change_cache import StreamChangeCache
 
-import ujson as json
 import logging