diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-30 11:15:37 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-30 11:15:37 +0000 |
| commit | d58edd98e91ad041a31a96980002c2d8899a2580 (patch) | |
| tree | 03799a7b282f13a68e8c9f6e53524594667ac77e | |
| parent | Don't mark newly joined room timelines as limited in an incremental sync (diff) | |
| download | synapse-d58edd98e91ad041a31a96980002c2d8899a2580.tar.xz | |
Update the other place check_joined_room is called
Diffstat (limited to '')
| -rw-r--r-- | synapse/events/utils.py | 3 | ||||
| -rw-r--r-- | synapse/handlers/sync.py | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 48548f8c40..9989b76591 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -154,7 +154,8 @@ def serialize_event(e, time_now_ms, as_client_event=True, if "redacted_because" in e.unsigned: d["unsigned"]["redacted_because"] = serialize_event( - e.unsigned["redacted_because"], time_now_ms + e.unsigned["redacted_because"], time_now_ms, + event_format=event_format ) if token_id is not None: diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 04f2d46d15..4c5a2353b2 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -520,7 +520,7 @@ class SyncHandler(BaseHandler): current_state=current_state_events, ) - state_events_delta = yield self.check_joined_room( + state_events_delta, _ = yield self.check_joined_room( sync_config, room_id, state_events_delta ) diff --git a/tox.ini b/tox.ini index a69948484f..01b23e6bd9 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,7 @@ commands = check-manifest [testenv:pep8] +skip_install = True basepython = python2.7 deps = flake8 |