aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/pagination.py
diff options
context:
space:
mode:
authorTom Christie2013-03-05 17:50:28 +0000
committerTom Christie2013-03-05 17:50:28 +0000
commitc20ebe95f6707d63373d9c583e90bcbc6e021899 (patch)
tree8c51d642ef180b37f6799a45ccced9b71665fb7c /rest_framework/tests/pagination.py
parent6e7ddd579b6604d1b0d6da8e4d09762be4520e35 (diff)
parent5e5cd6f7f7357d68d5c10500ec0379e49d679202 (diff)
downloaddjango-rest-framework-c20ebe95f6707d63373d9c583e90bcbc6e021899.tar.bz2
Merge datetime formats
Diffstat (limited to 'rest_framework/tests/pagination.py')
-rw-r--r--rest_framework/tests/pagination.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py
index 6b9970a6..472ffcdd 100644
--- a/rest_framework/tests/pagination.py
+++ b/rest_framework/tests/pagination.py
@@ -112,8 +112,8 @@ class IntegrationTestPaginationAndFiltering(TestCase):
self.objects = FilterableItem.objects
self.data = [
- {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date}
- for obj in self.objects.all()
+ {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date.isoformat()}
+ for obj in self.objects.all()
]
self.view = FilterFieldsRootView.as_view()