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
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 16bac95331..2680678de7 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -175,7 +175,7 @@ class FederationHandler(BaseHandler):
try:
yield self.store.store_room(
- event.room_id,
+ room_id,
"",
is_public=False
)
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 471dc86163..be10162db5 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -674,7 +674,7 @@ class PresenceHandler(BaseHandler):
def push_update_to_clients(self, observer_user, observed_user,
statuscache):
- state = statuscache.make_event(user=observed_user, clock=self.clock)
+ statuscache.make_event(user=observed_user, clock=self.clock)
self.notifier.on_new_user_event(
observer_user.to_string(),
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 5489de841f..c2b10f4189 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -20,8 +20,7 @@ from synapse.types import UserID, RoomAlias, RoomID
from synapse.api.constants import Membership
from synapse.api.errors import RoomError, StoreError, SynapseError
from synapse.api.events.room import (
- RoomTopicEvent, MessageEvent, InviteJoinEvent, RoomMemberEvent,
- RoomConfigEvent
+ RoomTopicEvent, RoomMemberEvent, RoomConfigEvent
)
from synapse.api.streams.event import EventStream, EventsStreamData
from synapse.handlers.presence import PresenceStreamData
@@ -29,7 +28,6 @@ from synapse.util import stringutils
from ._base import BaseHandler
import logging
-import json
logger = logging.getLogger(__name__)
@@ -303,8 +301,6 @@ class MessageHandler(BaseHandler):
except:
logger.exception("Failed to get snapshot")
- user = self.hs.parse_userid(user_id)
-
ret = {"rooms": rooms_ret, "presence": presence[0], "end": now_token}
# logger.debug("snapshot_all_rooms returning: %s", ret)
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 731317227d..6771da8fcd 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -249,7 +249,7 @@ class FeedbackRestServlet(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, room_id, msg_sender_id, msg_id, fb_sender_id,
feedback_type):
- user = yield (self.auth.get_user_by_req(request))
+ yield (self.auth.get_user_by_req(request))
# TODO (erikj): Implement this?
raise NotImplementedError("Getting feedback is not supported")
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index d06033b980..a97a42e1e3 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -16,8 +16,9 @@
from twisted.internet import defer
from synapse.api.events.room import (
- RoomMemberEvent, MessageEvent, RoomTopicEvent, FeedbackEvent,
- RoomConfigEvent, RoomNameEvent,
+ RoomMemberEvent, RoomTopicEvent, FeedbackEvent,
+# RoomConfigEvent,
+ RoomNameEvent,
)
from synapse.util.logutils import log_function
diff --git a/synapse/storage/feedback.py b/synapse/storage/feedback.py
index e60f98d1e1..cdc6670116 100644
--- a/synapse/storage/feedback.py
+++ b/synapse/storage/feedback.py
@@ -15,11 +15,7 @@
from twisted.internet import defer
-from ._base import SQLBaseStore, Table
-from synapse.api.events.room import FeedbackEvent
-
-import collections
-import json
+from ._base import SQLBaseStore
class FeedbackStore(SQLBaseStore):
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 22f2dcca45..a5751005ef 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -18,12 +18,10 @@ from twisted.internet import defer
from sqlite3 import IntegrityError
from synapse.api.errors import StoreError
-from synapse.api.events.room import RoomTopicEvent
from ._base import SQLBaseStore, Table
import collections
-import json
import logging
logger = logging.getLogger(__name__)
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 86519b60c6..4ad37af0f3 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -15,15 +15,10 @@
from twisted.internet import defer
-from synapse.types import UserID
-from synapse.api.constants import Membership
-from synapse.api.events.room import RoomMemberEvent
-
-from ._base import SQLBaseStore, Table
+from ._base import SQLBaseStore
+from synapse.api.constants import Membership
-import collections
-import json
import logging
logger = logging.getLogger(__name__)
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 3a17a723fe..cae80563b4 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -37,10 +37,8 @@ from twisted.internet import defer
from ._base import SQLBaseStore
from synapse.api.errors import SynapseError
-from synapse.api.constants import Membership
from synapse.util.logutils import log_function
-import json
import logging
|
