diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:56 +0100 |
| commit | 3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd (patch) | |
| tree | e8ababe0e0b7beb91e31d6687f1fb6ad10b73193 /synapse/api | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-3df5cb804f0b9a3ca6a5db969a4ac8e8d42685cd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 3 | ||||
| -rw-r--r-- | synapse/api/streams/event.py | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 385f93763a..15407df14a 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -19,8 +19,7 @@ from twisted.internet import defer from synapse.api.constants import Membership from synapse.api.errors import AuthError, StoreError, Codes -from synapse.api.events.room import (RoomTopicEvent, RoomMemberEvent, - MessageEvent, FeedbackEvent) +from synapse.api.events.room import RoomMemberEvent import logging 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 |