From 3a2a5b959cb1f56b26af32e1ad4c1db424279eb7 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 26 Aug 2014 18:57:46 +0100
Subject: WIP: Completely change how event streaming and pagination work. This
 reflects the change in the underlying storage model.

---
 synapse/rest/events.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'synapse/rest/events.py')

diff --git a/synapse/rest/events.py b/synapse/rest/events.py
index ca2f6978e5..28da418498 100644
--- a/synapse/rest/events.py
+++ b/synapse/rest/events.py
@@ -17,7 +17,7 @@
 from twisted.internet import defer
 
 from synapse.api.errors import SynapseError
-from synapse.api.streams import PaginationConfig
+from synapse.streams.config import PaginationConfig
 from synapse.rest.base import RestServlet, client_path_pattern
 
 
@@ -41,11 +41,13 @@ class EventStreamRestServlet(RestServlet):
 
         chunk = yield handler.get_stream(auth_user.to_string(), pagin_config,
                                          timeout=timeout)
+
         defer.returnValue((200, chunk))
 
     def on_OPTIONS(self, request):
         return (200, {})
 
 
+
 def register_servlets(hs, http_server):
     EventStreamRestServlet(hs).register(http_server)
-- 
cgit 1.4.1