summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-11-02 15:10:59 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2015-11-02 15:10:59 +0000
commit192241cf2abc54b10ba77408808794bb728ddb70 (patch)
tree450a753759d071cd26ff7937f5aa07db3d9f76f5 /synapse/notifier.py
parentMerge pull request #338 from matrix-org/daniel/fixdb (diff)
downloadsynapse-192241cf2abc54b10ba77408808794bb728ddb70.tar.xz
Remove unused arguments and code
Diffstat (limited to '')
-rw-r--r--synapse/notifier.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index f998fc83bf..5c081fef17 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -269,7 +269,7 @@ class Notifier(object):
                 logger.exception("Failed to notify listener")
 
     @defer.inlineCallbacks
-    def wait_for_events(self, user, rooms, timeout, callback,
+    def wait_for_events(self, user, timeout, callback,
                         from_token=StreamToken("s0", "0", "0", "0")):
         """Wait until the callback returns a non empty response or the
         timeout fires.
@@ -328,7 +328,7 @@ class Notifier(object):
         defer.returnValue(result)
 
     @defer.inlineCallbacks
-    def get_events_for(self, user, rooms, pagination_config, timeout,
+    def get_events_for(self, user, pagination_config, timeout,
                        only_room_events=False):
         """ For the given user and rooms, return any new events for them. If
         there are no new events wait for up to `timeout` milliseconds for any
@@ -369,7 +369,7 @@ class Notifier(object):
                 defer.returnValue(None)
 
         result = yield self.wait_for_events(
-            user, rooms, timeout, check_for_updates, from_token=from_token
+            user, timeout, check_for_updates, from_token=from_token
         )
 
         if result is None: