mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-06-18 20:43:29 +03:00
Remove Django 1.5 EmailValidator fallback
This commit is contained in:
parent
8edb9d3c1f
commit
9216dc9a25
|
@ -183,19 +183,6 @@ else:
|
||||||
super(URLValidator, self).__init__(*args, **kwargs)
|
super(URLValidator, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
# EmailValidator requires explicit regex prior to 1.6+
|
|
||||||
if django.VERSION >= (1, 6):
|
|
||||||
from django.core.validators import EmailValidator
|
|
||||||
else:
|
|
||||||
from django.core.validators import EmailValidator as DjangoEmailValidator
|
|
||||||
from django.core.validators import email_re
|
|
||||||
|
|
||||||
|
|
||||||
class EmailValidator(DjangoEmailValidator):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
super(EmailValidator, self).__init__(email_re, *args, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
# PATCH method is not implemented by Django
|
# PATCH method is not implemented by Django
|
||||||
if 'patch' not in View.http_method_names:
|
if 'patch' not in View.http_method_names:
|
||||||
View.http_method_names = View.http_method_names + ['patch']
|
View.http_method_names = View.http_method_names + ['patch']
|
||||||
|
|
|
@ -11,7 +11,7 @@ import uuid
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.core.validators import RegexValidator, ip_address_validators
|
from django.core.validators import EmailValidator, RegexValidator, ip_address_validators
|
||||||
from django.forms import FilePathField as DjangoFilePathField
|
from django.forms import FilePathField as DjangoFilePathField
|
||||||
from django.forms import ImageField as DjangoImageField
|
from django.forms import ImageField as DjangoImageField
|
||||||
from django.utils import six, timezone
|
from django.utils import six, timezone
|
||||||
|
@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from rest_framework import ISO_8601
|
from rest_framework import ISO_8601
|
||||||
from rest_framework.compat import (
|
from rest_framework.compat import (
|
||||||
EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
|
MaxLengthValidator, MaxValueValidator, MinLengthValidator,
|
||||||
MinValueValidator, OrderedDict, URLValidator, duration_string,
|
MinValueValidator, OrderedDict, URLValidator, duration_string,
|
||||||
parse_duration, unicode_repr, unicode_to_repr
|
parse_duration, unicode_repr, unicode_to_repr
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user