3 files changed, 4 insertions, 3 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py
index d89dfc193c..2e7563d14b 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,6 +41,7 @@ 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):
diff --git a/synapse/rest/initial_sync.py b/synapse/rest/initial_sync.py
index ce7937a919..d18c4c0f60 100644
--- a/synapse/rest/initial_sync.py
+++ b/synapse/rest/initial_sync.py
@@ -15,7 +15,7 @@
from twisted.internet import defer
-from synapse.api.streams import PaginationConfig
+from synapse.streams.config import PaginationConfig
from base import RestServlet, client_path_pattern
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index ebe4e24432..a10b3b54f9 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -18,9 +18,9 @@ from twisted.internet import defer
from base import RestServlet, client_path_pattern
from synapse.api.errors import SynapseError, Codes
+from synapse.streams.config import PaginationConfig
from synapse.api.events.room import RoomMemberEvent
from synapse.api.constants import Membership
-from synapse.api.streams import PaginationConfig
import json
import logging
|