Skip to content

Commit 74c995c

Browse files
committed
Remove DecimalValidator compat
1 parent 0d78453 commit 74c995c

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

rest_framework/compat.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,6 @@ def md_filter_add_syntax_highlight(md):
277277
LONG_SEPARATORS = (b', ', b': ')
278278
INDENT_SEPARATORS = (b',', b': ')
279279

280-
# TODO: Remove
281-
try:
282-
# DecimalValidator is unavailable in Django < 1.9
283-
from django.core.validators import DecimalValidator
284-
except ImportError:
285-
DecimalValidator = None
286280

287281
class CustomValidatorMessage(object):
288282
"""

rest_framework/utils/field_mapping.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from django.db import models
99
from django.utils.text import capfirst
1010

11-
from rest_framework.compat import DecimalValidator, postgres_fields
11+
from rest_framework.compat import postgres_fields
1212
from rest_framework.validators import UniqueValidator
1313

1414
NUMERIC_FIELD_TYPES = (
@@ -181,11 +181,10 @@ def get_field_kwargs(field_name, model_field):
181181
if validator is not validators.validate_ipv46_address
182182
]
183183
# Our decimal validation is handled in the field code, not validator code.
184-
# (In Django 1.9+ this differs from previous style)
185-
if isinstance(model_field, models.DecimalField) and DecimalValidator:
184+
if isinstance(model_field, models.DecimalField):
186185
validator_kwarg = [
187186
validator for validator in validator_kwarg
188-
if not isinstance(validator, DecimalValidator)
187+
if not isinstance(validator, validators.DecimalValidator)
189188
]
190189

191190
# Ensure that max_length is passed explicitly as a keyword arg,

0 commit comments

Comments
 (0)