Merge 30817e3 into 65f4cba

Kinto · Mar 16, 2017 · 17b1ae5 · 17b1ae5
2 parents 65f4cba + 30817e3
commit 17b1ae5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,7 +7,9 @@ This document describes changes between each past release.
 7.1.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+**Bug fixes**
+
+- Method for plural endpoints now return list of objects instead of ``odict_values``.
 
 
 7.0.0 (2016-09-30)

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VIRTUALENV = virtualenv
+VIRTUALENV = virtualenv --python python3
 VENV := $(shell echo $${VIRTUAL_ENV-.venv})
 PYTHON = $(VENV)/bin/python
 DEV_STAMP = $(VENV)/.dev_env_installed.stamp
@@ -30,6 +30,7 @@ need-kinto-running:
 	@curl http://localhost:8888/v0/ 2>/dev/null 1>&2 || (echo "Run 'make runkinto' before starting tests." && exit 1)
 
 runkinto: install-dev
+	$(VENV)/bin/python --version
 	$(VENV)/bin/kinto --ini kinto_http/tests/config/kinto.ini migrate
 	$(VENV)/bin/kinto --ini kinto_http/tests/config/kinto.ini start
 

diff --git a/kinto_http/__init__.py b/kinto_http/__init__.py
@@ -145,7 +145,7 @@ def _paginated(self, endpoint, records=None, if_none_match=None, **kwargs):
                 next_page = headers['Next-Page']
                 return self._paginated(next_page, records,
                                        if_none_match=if_none_match)
-        return records.values()
+        return list(records.values())
 
     def _get_cache_headers(self, safe, data=None, if_match=None):
         has_data = data is not None and data.get('last_modified')