Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 14:59:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix a few pyflakes errors

Browse Source
This commit is contained in:
Mark Haines 2014-08-26 16:01:29 +01:00
parent 4b2ad549d5
commit 32347bfcc9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/handlers/room.py
View File

@ -222,8 +222,7 @@ class MessageHandler(BaseHandler):
if stamp_event: if stamp_event:
event.content["hsob_ts"] = int(self.clock.time_msec()) event.content["hsob_ts"] = int(self.clock.time_msec())
snapshot = yield self.store.snapshot_room(event.room_id, user_id) snapshot = yield self.store.snapshot_room(event.room_id, event.user_id)
yield self.auth.check(event, snapshot, raises=True) yield self.auth.check(event, snapshot, raises=True)
@ -577,8 +576,8 @@ class RoomMemberHandler(BaseHandler):
content=content, content=content,
) )
snapshot = yield store.snapshot_room( snapshot = yield self.store.snapshot_room(
room_id, joinee, RoomMemberEvent.TYPE, event.target_user_id room_id, joinee, RoomMemberEvent.TYPE, joinee
) )
yield self._do_join(new_event, snapshot, room_host=host, do_auth=True) yield self._do_join(new_event, snapshot, room_host=host, do_auth=True)

6
synapse/storage/__init__.py
View File

@ -69,7 +69,7 @@ class DataStore(RoomMemberStore, RoomStore,
stream_ordering = self.min_token stream_ordering = self.min_token
latest = yield self._db_pool.runInteraction( latest = yield self._db_pool.runInteraction(
_persist_event_txn, event, backfilled, stream_ordering self._persist_event_txn, event, backfilled, stream_ordering
) )
defer.returnValue(latest) defer.returnValue(latest)
@ -128,7 +128,7 @@ class DataStore(RoomMemberStore, RoomStore,
except: except:
logger.exception( logger.exception(
"Failed to persist, probably duplicate: %s", "Failed to persist, probably duplicate: %s",
event_id event.event_id
) )
return return
@ -146,7 +146,7 @@ class DataStore(RoomMemberStore, RoomStore,
self._simple_insert_txn(txn, "state_events", vals) self._simple_insert_txn(txn, "state_events", vals)
self._simple_insert_txn( self._simple_insert_txn(
txn txn,
"current_state_events", "current_state_events",
{ {
"event_id": event.event_id, "event_id": event.event_id,