summary refs log tree commit diff
path: root/synapse/api/streams/event.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 16:03:56 +0100
commit3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch)
treee8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /synapse/api/streams/event.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentFix pyflakes errors (diff)
downloadsynapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/api/streams/event.py')
-rw-r--r--synapse/api/streams/event.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/api/streams/event.py b/synapse/api/streams/event.py
index a5c8b2b31f..fe44a488bc 100644
--- a/synapse/api/streams/event.py
+++ b/synapse/api/streams/event.py
@@ -19,9 +19,6 @@ from twisted.internet import defer
 
 from synapse.api.errors import EventStreamError
 from synapse.api.events import SynapseEvent
-from synapse.api.events.room import (
-    RoomMemberEvent, MessageEvent, FeedbackEvent, RoomTopicEvent
-)
 from synapse.api.streams import PaginationStream, StreamData
 
 import logging