summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-04 17:26:41 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-04 17:26:41 +0000
commit1758187715db13cce9085c20fa866f7bbeed7680 (patch)
tree151b669f040baaaad81b4f79d2ccc619932595c1 /synapse/storage
parentMerge pull request #346 from matrix-org/markjh/remove_lock_manager (diff)
parentMerge branch 'develop' into daniel/removesomelies (diff)
downloadsynapse-1758187715db13cce9085c20fa866f7bbeed7680.tar.xz
Merge pull request #339 from matrix-org/daniel/removesomelies
Remove unused arguments and code
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/stream.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 15d4c2bf68..c728013f4c 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -158,8 +158,7 @@ class StreamStore(SQLBaseStore):
         defer.returnValue(results)
 
     @log_function
-    def get_room_events_stream(self, user_id, from_key, to_key, room_id,
-                               limit=0):
+    def get_room_events_stream(self, user_id, from_key, to_key, limit=0):
         current_room_membership_sql = (
             "SELECT m.room_id FROM room_memberships as m "
             " INNER JOIN current_state_events as c"