From 9216dc9a254160a9903359fbf0db2b2c5826212c Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Mon, 21 Sep 2015 16:20:07 +0200 Subject: [PATCH] Remove Django 1.5 EmailValidator fallback --- rest_framework/compat.py | 13 ------------- rest_framework/fields.py | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 4d3b29ddd..fa737f42a 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -183,19 +183,6 @@ else: 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 if 'patch' not in View.http_method_names: View.http_method_names = View.http_method_names + ['patch'] diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 7c48c621e..63e0b2dbf 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -11,7 +11,7 @@ import uuid from django.conf import settings from django.core.exceptions import ValidationError as DjangoValidationError 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 ImageField as DjangoImageField 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.compat import ( - EmailValidator, MaxLengthValidator, MaxValueValidator, MinLengthValidator, + MaxLengthValidator, MaxValueValidator, MinLengthValidator, MinValueValidator, OrderedDict, URLValidator, duration_string, parse_duration, unicode_repr, unicode_to_repr )