|
12 | 12 | from django.core.exceptions import ObjectDoesNotExist
|
13 | 13 | from django.core.exceptions import ValidationError as DjangoValidationError
|
14 | 14 | from django.core.validators import (
|
15 |
| - EmailValidator, RegexValidator, URLValidator, ip_address_validators |
| 15 | + EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator, |
| 16 | + MinValueValidator, RegexValidator, URLValidator, ip_address_validators |
16 | 17 | )
|
17 | 18 | from django.forms import FilePathField as DjangoFilePathField
|
18 | 19 | from django.forms import ImageField as DjangoImageField
|
|
23 | 24 | from django.utils.duration import duration_string
|
24 | 25 | from django.utils.encoding import is_protected_type, smart_text
|
25 | 26 | from django.utils.formats import localize_input, sanitize_separators
|
26 |
| -from django.utils.functional import lazy |
27 | 27 | from django.utils.ipv6 import clean_ipv6_address
|
28 | 28 | from django.utils.timezone import utc
|
29 | 29 | from django.utils.translation import gettext_lazy as _
|
30 | 30 | from pytz.exceptions import InvalidTimeError
|
31 | 31 |
|
32 | 32 | from rest_framework import ISO_8601
|
33 |
| -from rest_framework.compat import ( |
34 |
| - MaxLengthValidator, MaxValueValidator, MinLengthValidator, |
35 |
| - MinValueValidator, ProhibitNullCharactersValidator |
36 |
| -) |
| 33 | +from rest_framework.compat import ProhibitNullCharactersValidator |
37 | 34 | from rest_framework.exceptions import ErrorDetail, ValidationError
|
38 | 35 | from rest_framework.settings import api_settings
|
39 | 36 | from rest_framework.utils import html, humanize_datetime, json, representation
|
| 37 | +from rest_framework.utils.formatting import lazy_format |
40 | 38 |
|
41 | 39 |
|
42 | 40 | class empty:
|
@@ -749,12 +747,11 @@ def __init__(self, **kwargs):
|
749 | 747 | self.min_length = kwargs.pop('min_length', None)
|
750 | 748 | super().__init__(**kwargs)
|
751 | 749 | if self.max_length is not None:
|
752 |
| - message = lazy(self.error_messages['max_length'].format, str)(max_length=self.max_length) |
| 750 | + message = lazy_format(self.error_messages['max_length'], max_length=self.max_length) |
753 | 751 | self.validators.append(
|
754 | 752 | MaxLengthValidator(self.max_length, message=message))
|
755 | 753 | if self.min_length is not None:
|
756 |
| - message = lazy( |
757 |
| - self.error_messages['min_length'].format, str)(min_length=self.min_length) |
| 754 | + message = lazy_format(self.error_messages['min_length'], min_length=self.min_length) |
758 | 755 | self.validators.append(
|
759 | 756 | MinLengthValidator(self.min_length, message=message))
|
760 | 757 |
|
@@ -915,13 +912,11 @@ def __init__(self, **kwargs):
|
915 | 912 | self.min_value = kwargs.pop('min_value', None)
|
916 | 913 | super().__init__(**kwargs)
|
917 | 914 | if self.max_value is not None:
|
918 |
| - message = lazy( |
919 |
| - self.error_messages['max_value'].format, str)(max_value=self.max_value) |
| 915 | + message = lazy_format(self.error_messages['max_value'], max_value=self.max_value) |
920 | 916 | self.validators.append(
|
921 | 917 | MaxValueValidator(self.max_value, message=message))
|
922 | 918 | if self.min_value is not None:
|
923 |
| - message = lazy( |
924 |
| - self.error_messages['min_value'].format, str)(min_value=self.min_value) |
| 919 | + message = lazy_format(self.error_messages['min_value'], min_value=self.min_value) |
925 | 920 | self.validators.append(
|
926 | 921 | MinValueValidator(self.min_value, message=message))
|
927 | 922 |
|
@@ -953,15 +948,11 @@ def __init__(self, **kwargs):
|
953 | 948 | self.min_value = kwargs.pop('min_value', None)
|
954 | 949 | super().__init__(**kwargs)
|
955 | 950 | if self.max_value is not None:
|
956 |
| - message = lazy( |
957 |
| - self.error_messages['max_value'].format, |
958 |
| - str)(max_value=self.max_value) |
| 951 | + message = lazy_format(self.error_messages['max_value'], max_value=self.max_value) |
959 | 952 | self.validators.append(
|
960 | 953 | MaxValueValidator(self.max_value, message=message))
|
961 | 954 | if self.min_value is not None:
|
962 |
| - message = lazy( |
963 |
| - self.error_messages['min_value'].format, |
964 |
| - str)(min_value=self.min_value) |
| 955 | + message = lazy_format(self.error_messages['min_value'], min_value=self.min_value) |
965 | 956 | self.validators.append(
|
966 | 957 | MinValueValidator(self.min_value, message=message))
|
967 | 958 |
|
@@ -1012,14 +1003,11 @@ def __init__(self, max_digits, decimal_places, coerce_to_string=None, max_value=
|
1012 | 1003 | super().__init__(**kwargs)
|
1013 | 1004 |
|
1014 | 1005 | if self.max_value is not None:
|
1015 |
| - message = lazy( |
1016 |
| - self.error_messages['max_value'].format, |
1017 |
| - str)(max_value=self.max_value) |
| 1006 | + message = lazy_format(self.error_messages['max_value'], max_value=self.max_value) |
1018 | 1007 | self.validators.append(
|
1019 | 1008 | MaxValueValidator(self.max_value, message=message))
|
1020 | 1009 | if self.min_value is not None:
|
1021 |
| - message = lazy( |
1022 |
| - self.error_messages['min_value'].format, str)(min_value=self.min_value) |
| 1010 | + message = lazy_format(self.error_messages['min_value'], min_value=self.min_value) |
1023 | 1011 | self.validators.append(
|
1024 | 1012 | MinValueValidator(self.min_value, message=message))
|
1025 | 1013 |
|
@@ -1357,15 +1345,11 @@ def __init__(self, **kwargs):
|
1357 | 1345 | self.min_value = kwargs.pop('min_value', None)
|
1358 | 1346 | super().__init__(**kwargs)
|
1359 | 1347 | if self.max_value is not None:
|
1360 |
| - message = lazy( |
1361 |
| - self.error_messages['max_value'].format, |
1362 |
| - str)(max_value=self.max_value) |
| 1348 | + message = lazy_format(self.error_messages['max_value'], max_value=self.max_value) |
1363 | 1349 | self.validators.append(
|
1364 | 1350 | MaxValueValidator(self.max_value, message=message))
|
1365 | 1351 | if self.min_value is not None:
|
1366 |
| - message = lazy( |
1367 |
| - self.error_messages['min_value'].format, |
1368 |
| - str)(min_value=self.min_value) |
| 1352 | + message = lazy_format(self.error_messages['min_value'], min_value=self.min_value) |
1369 | 1353 | self.validators.append(
|
1370 | 1354 | MinValueValidator(self.min_value, message=message))
|
1371 | 1355 |
|
@@ -1610,10 +1594,10 @@ def __init__(self, *args, **kwargs):
|
1610 | 1594 | super().__init__(*args, **kwargs)
|
1611 | 1595 | self.child.bind(field_name='', parent=self)
|
1612 | 1596 | if self.max_length is not None:
|
1613 |
| - message = lazy(self.error_messages['max_length'].format, str)(max_length=self.max_length) |
| 1597 | + message = lazy_format(self.error_messages['max_length'], max_length=self.max_length) |
1614 | 1598 | self.validators.append(MaxLengthValidator(self.max_length, message=message))
|
1615 | 1599 | if self.min_length is not None:
|
1616 |
| - message = lazy(self.error_messages['min_length'].format, str)(min_length=self.min_length) |
| 1600 | + message = lazy_format(self.error_messages['min_length'], min_length=self.min_length) |
1617 | 1601 | self.validators.append(MinLengthValidator(self.min_length, message=message))
|
1618 | 1602 |
|
1619 | 1603 | def get_value(self, dictionary):
|
@@ -1886,8 +1870,7 @@ def __init__(self, model_field, **kwargs):
|
1886 | 1870 | max_length = kwargs.pop('max_length', None)
|
1887 | 1871 | super().__init__(**kwargs)
|
1888 | 1872 | if max_length is not None:
|
1889 |
| - message = lazy( |
1890 |
| - self.error_messages['max_length'].format, str)(max_length=self.max_length) |
| 1873 | + message = lazy_format(self.error_messages['max_length'], max_length=self.max_length) |
1891 | 1874 | self.validators.append(
|
1892 | 1875 | MaxLengthValidator(self.max_length, message=message))
|
1893 | 1876 |
|
|
0 commit comments