diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index 1d8cb22f2f..af7ab02311 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -130,10 +130,10 @@ def get_field_kwargs(field_name, model_field):
# Our decimal validation is handled in the field code, not validator code.
# (In Django 1.9+ this differs from previous style)
- if isinstance(model_field, models.DecimalField):
+ if isinstance(model_field, models.DecimalField) and DecimalValidator:
validator_kwarg = [
validator for validator in validator_kwarg
- if DecimalValidator and not isinstance(validator, DecimalValidator)
+ if not isinstance(validator, DecimalValidator)
]
# Ensure that max_length is passed explicitly as a keyword arg,
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 57e540e7a5..af8ce66dd7 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -22,7 +22,7 @@
from rest_framework import serializers
from rest_framework.compat import DurationField as ModelDurationField
-from rest_framework.compat import DecimalValidator, unicode_repr
+from rest_framework.compat import unicode_repr
def dedent(blocktext):
@@ -872,11 +872,9 @@ class DecimalFieldModel(models.Model):
class TestDecimalFieldMappings(TestCase):
- @pytest.mark.skipif(DecimalValidator is not None,
- reason='DecimalValidator is available in Django 1.9+')
- def test_decimal_field_has_no_decimal_validator(self):
+ def test_decimal_field_has_decimal_validator(self):
"""
- Test that a DecimalField has no validators before Django 1.9.
+ Test that a `DecimalField` has no `DecimalValidator`.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
@@ -884,13 +882,12 @@ class Meta:
serializer = TestSerializer()
- assert len(serializer.fields['decimal_field'].validators) == 0
+ assert len(serializer.fields['decimal_field'].validators) == 2
- @pytest.mark.skipif(DecimalValidator is None,
- reason='DecimalValidator is available in Django 1.9+')
- def test_decimal_field_has_decimal_validator(self):
+ def test_min_value_is_passed(self):
"""
- Test that a DecimalField has DecimalValidator in Django 1.9+.
+ Test that the `MinValueValidator` is converted to the `min_value`
+ argument for the field.
"""
class TestSerializer(serializers.ModelSerializer):
class Meta:
@@ -898,4 +895,17 @@ class Meta:
serializer = TestSerializer()
- assert len(serializer.fields['decimal_field'].validators) == 2
+ assert serializer.fields['decimal_field'].min_value == 1
+
+ def test_max_value_is_passed(self):
+ """
+ Test that the `MaxValueValidator` is converted to the `max_value`
+ argument for the field.
+ """
+ class TestSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = DecimalFieldModel
+
+ serializer = TestSerializer()
+
+ assert serializer.fields['decimal_field'].max_value == 3
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy