diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 56d006efb6..ee4a75271b 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -8,6 +8,11 @@
import django
from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.core.validators import (
+ MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+ MinValueValidator
+)
from django.db import connection, transaction
from django.template import Context, RequestContext, Template
from django.utils import six
@@ -109,39 +114,26 @@ def clean_manytomany_helptext(text):
pass
-# MinValueValidator, MaxValueValidator et al. only accept `message` in 1.8+
-if django.VERSION >= (1, 8):
- from django.core.validators import MinValueValidator, MaxValueValidator
- from django.core.validators import MinLengthValidator, MaxLengthValidator
-else:
- from django.core.validators import MinValueValidator as DjangoMinValueValidator
- from django.core.validators import MaxValueValidator as DjangoMaxValueValidator
- from django.core.validators import MinLengthValidator as DjangoMinLengthValidator
- from django.core.validators import MaxLengthValidator as DjangoMaxLengthValidator
+class CustomValidatorMessage(object):
+ def __init__(self, *args, **kwargs):
+ self.message = kwargs.pop('message', self.message)
+ super(CustomValidatorMessage, self).__init__(*args, **kwargs)
- class MinValueValidator(DjangoMinValueValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(MinValueValidator, self).__init__(*args, **kwargs)
+class MinValueValidator(CustomValidatorMessage, MinValueValidator):
+ pass
- class MaxValueValidator(DjangoMaxValueValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(MaxValueValidator, self).__init__(*args, **kwargs)
+class MaxValueValidator(CustomValidatorMessage, MaxValueValidator):
+ pass
- class MinLengthValidator(DjangoMinLengthValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(MinLengthValidator, self).__init__(*args, **kwargs)
+class MinLengthValidator(CustomValidatorMessage, MinLengthValidator):
+ pass
- class MaxLengthValidator(DjangoMaxLengthValidator):
- def __init__(self, *args, **kwargs):
- self.message = kwargs.pop('message', self.message)
- super(MaxLengthValidator, self).__init__(*args, **kwargs)
+class MaxLengthValidator(CustomValidatorMessage, MaxLengthValidator):
+ pass
# PATCH method is not implemented by Django
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 1893a32c9a..55e56ce398 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -21,7 +21,7 @@
from django.utils import six, timezone
from django.utils.dateparse import parse_date, parse_datetime, parse_time
from django.utils.encoding import is_protected_type, smart_text
-from django.utils.functional import cached_property
+from django.utils.functional import cached_property, lazy
from django.utils.ipv6 import clean_ipv6_address
from django.utils.translation import ugettext_lazy as _
@@ -679,11 +679,17 @@ def __init__(self, **kwargs):
self.min_length = kwargs.pop('min_length', None)
super(CharField, self).__init__(**kwargs)
if self.max_length is not None:
- message = self.error_messages['max_length'].format(max_length=self.max_length)
- self.validators.append(MaxLengthValidator(self.max_length, message=message))
+ message = lazy(
+ self.error_messages['max_length'].format,
+ six.text_type)(max_length=self.max_length)
+ self.validators.append(
+ MaxLengthValidator(self.max_length, message=message))
if self.min_length is not None:
- message = self.error_messages['min_length'].format(min_length=self.min_length)
- self.validators.append(MinLengthValidator(self.min_length, message=message))
+ message = lazy(
+ self.error_messages['min_length'].format,
+ six.text_type)(min_length=self.min_length)
+ self.validators.append(
+ MinLengthValidator(self.min_length, message=message))
def run_validation(self, data=empty):
# Test for the empty string here so that it does not get validated,
@@ -824,11 +830,17 @@ def __init__(self, **kwargs):
self.min_value = kwargs.pop('min_value', None)
super(IntegerField, self).__init__(**kwargs)
if self.max_value is not None:
- message = self.error_messages['max_value'].format(max_value=self.max_value)
- self.validators.append(MaxValueValidator(self.max_value, message=message))
+ message = lazy(
+ self.error_messages['max_value'].format,
+ six.text_type)(max_value=self.max_value)
+ self.validators.append(
+ MaxValueValidator(self.max_value, message=message))
if self.min_value is not None:
- message = self.error_messages['min_value'].format(min_value=self.min_value)
- self.validators.append(MinValueValidator(self.min_value, message=message))
+ message = lazy(
+ self.error_messages['min_value'].format,
+ six.text_type)(min_value=self.min_value)
+ self.validators.append(
+ MinValueValidator(self.min_value, message=message))
def to_internal_value(self, data):
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@@ -858,11 +870,17 @@ def __init__(self, **kwargs):
self.min_value = kwargs.pop('min_value', None)
super(FloatField, self).__init__(**kwargs)
if self.max_value is not None:
- message = self.error_messages['max_value'].format(max_value=self.max_value)
- self.validators.append(MaxValueValidator(self.max_value, message=message))
+ message = lazy(
+ self.error_messages['max_value'].format,
+ six.text_type)(max_value=self.max_value)
+ self.validators.append(
+ MaxValueValidator(self.max_value, message=message))
if self.min_value is not None:
- message = self.error_messages['min_value'].format(min_value=self.min_value)
- self.validators.append(MinValueValidator(self.min_value, message=message))
+ message = lazy(
+ self.error_messages['min_value'].format,
+ six.text_type)(min_value=self.min_value)
+ self.validators.append(
+ MinValueValidator(self.min_value, message=message))
def to_internal_value(self, data):
if isinstance(data, six.text_type) and len(data) > self.MAX_STRING_LENGTH:
@@ -906,11 +924,17 @@ def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=
super(DecimalField, self).__init__(**kwargs)
if self.max_value is not None:
- message = self.error_messages['max_value'].format(max_value=self.max_value)
- self.validators.append(MaxValueValidator(self.max_value, message=message))
+ message = lazy(
+ self.error_messages['max_value'].format,
+ six.text_type)(max_value=self.max_value)
+ self.validators.append(
+ MaxValueValidator(self.max_value, message=message))
if self.min_value is not None:
- message = self.error_messages['min_value'].format(min_value=self.min_value)
- self.validators.append(MinValueValidator(self.min_value, message=message))
+ message = lazy(
+ self.error_messages['min_value'].format,
+ six.text_type)(min_value=self.min_value)
+ self.validators.append(
+ MinValueValidator(self.min_value, message=message))
def to_internal_value(self, data):
"""
@@ -1661,8 +1685,11 @@ def __init__(self, model_field, **kwargs):
max_length = kwargs.pop('max_length', None)
super(ModelField, self).__init__(**kwargs)
if max_length is not None:
- message = self.error_messages['max_length'].format(max_length=max_length)
- self.validators.append(MaxLengthValidator(max_length, message=message))
+ message = lazy(
+ self.error_messages['max_length'].format,
+ six.text_type)(max_length=max_length)
+ self.validators.append(
+ MaxLengthValidator(max_length, message=message))
def to_internal_value(self, data):
rel = getattr(self.model_field, 'rel', None)
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