aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rest_framework/tests/filterset.py3
-rw-r--r--rest_framework/tests/pagination.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/rest_framework/tests/filterset.py b/rest_framework/tests/filterset.py
index b21abacb..5b2721ff 100644
--- a/rest_framework/tests/filterset.py
+++ b/rest_framework/tests/filterset.py
@@ -1,4 +1,5 @@
import datetime
+from decimal import Decimal
from django.test import TestCase
from django.test.client import RequestFactory
from rest_framework import generics, status
@@ -50,7 +51,7 @@ class IntegrationTestFiltering(TestCase):
"""
Create 10 FilterableItem instances.
"""
- base_data = ('a', 0.25, datetime.date(2012, 10, 8))
+ base_data = ('a', Decimal('0.25'), datetime.date(2012, 10, 8))
for i in range(10):
text = chr(i + ord(base_data[0])) * 3 # Produces string 'aaa', 'bbb', etc.
decimal = base_data[1] + i
diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py
index 054b7ee3..8c5e6ad7 100644
--- a/rest_framework/tests/pagination.py
+++ b/rest_framework/tests/pagination.py
@@ -1,4 +1,5 @@
import datetime
+from decimal import Decimal
from django.core.paginator import Paginator
from django.test import TestCase
from django.test.client import RequestFactory
@@ -83,7 +84,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
"""
Create 50 FilterableItem instances.
"""
- base_data = ('a', 0.25, datetime.date(2012, 10, 8))
+ base_data = ('a', Decimal(0.25), datetime.date(2012, 10, 8))
for i in range(26):
text = chr(i + ord(base_data[0])) * 3 # Produces string 'aaa', 'bbb', etc.
decimal = base_data[1] + i