summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-06 13:13:17 +0000
committerErik Johnston <erik@matrix.org>2015-01-06 13:13:17 +0000
commitaf1c7c7808d297711e4b76b862c41a5ec2ca3a9a (patch)
tree08210f2728dc1989708baac3eef165611725d64b
parentRemove debug lines (diff)
downloadsynapse-af1c7c7808d297711e4b76b862c41a5ec2ca3a9a.tar.xz
PEP8
Diffstat (limited to '')
-rw-r--r--synapse/storage/_base.py6
-rw-r--r--synapse/storage/stream.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 9687222e72..e799ac6c5d 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -449,7 +449,8 @@ class SQLBaseStore(object):
         return [
             self._get_event_txn(
                 txn, event_id,
-                check_redacted=check_redacted, get_prev_content=get_prev_content
+                check_redacted=check_redacted,
+                get_prev_content=get_prev_content
             )
             for event_id in event_ids
         ]
@@ -473,7 +474,8 @@ class SQLBaseStore(object):
         internal_metadata, js, redacted = res
 
         return self._get_event_from_row_txn(
-            txn, internal_metadata, js, redacted, check_redacted=check_redacted,
+            txn, internal_metadata, js, redacted,
+            check_redacted=check_redacted,
             get_prev_content=get_prev_content,
         )
 
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index c51f489451..bd3a411ead 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -142,7 +142,6 @@ class StreamStore(SQLBaseStore):
                                limit=0, with_feedback=False):
         # TODO (erikj): Handle compressed feedback
 
-
         current_room_membership_sql = (
             "SELECT m.room_id FROM room_memberships as m "
             "INNER JOIN current_state_events as c ON m.event_id = c.event_id "