diff --git a/setup.py b/setup.py index e3dd252..e90e923 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ 'flask', 'flask-sqlalchemy', 'tornado', - 'sanic', + 'sanic<21', 'aiohttp', 'pyyaml', ] diff --git a/unrest/rest.py b/unrest/rest.py index ba2dfdc..aaf2306 100644 --- a/unrest/rest.py +++ b/unrest/rest.py @@ -526,10 +526,10 @@ def serialize_all(self, items): if isinstance(items, Query): rv['occurences'] = items.offset(None).limit(None).count() - if items._offset is not None: - rv['offset'] = items._offset - if items._limit is not None: - rv['limit'] = items._limit + if items.selectable._offset is not None: + rv['offset'] = items.selectable._offset + if items.selectable._limit is not None: + rv['limit'] = items.selectable._limit rv['objects'] = [self.serialize(item) for item in items] if 'occurences' not in rv: