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)
diff --git a/synapse/rest/initial_sync.py b/synapse/rest/initial_sync.py
index fab748f562..e5059ff78c 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 b031ad1bc4..ab05a7438d 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -22,7 +22,7 @@ from synapse.api.events.room import (
MessageEvent, RoomMemberEvent, FeedbackEvent
)
from synapse.api.constants import Feedback
-from synapse.api.streams import PaginationConfig
+from synapse.streams.config import PaginationConfig
import json
import logging
|