Projet

Général

Profil

0002-django-1.6-adapt-to-API-change-on-EmailValidator.patch

Benjamin Dauvergne, 05 août 2014 15:23

Télécharger (1,44 ko)

Voir les différences: 

Subject: [PATCH 2/2] [django-1.6] adapt to API change on EmailValidator

keep local implementation backward compatible with Django < 1.6

refs #5244

 authentic2/validators.py |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
authentic2/validators.py
3 3 
import smtplib
4 4 

  		




  5
  5
  
    
from django.utils.translation import ugettext_lazy as _

  		




  6
  
  
    
from django.core.validators import EmailValidator, email_re

  		




  
  6
  
    
from django.core.validators import EmailValidator

  		




  7
  7
  
    
from django.core.exceptions import ValidationError

  		




  8
  8
  
    

  		




  9
  9
  
    
import dns.resolver

  		




  ......




  42
  42
  
    
        except dns.resolver.NoAnswer:

  		




  43
  43
  
    
            raise ValidationError(_('Nonexistent email address.'))

  		




  44
  44
  
    

  		




  45
  
  
    

  		




  46
  
  
    
validate_email = EmailValidator(

  		




  47
  
  
    
    email_re,

  		




  48
  
  
    
    _('Enter a valid email address.'),

  		




  49
  
  
    
    'invalid'

  		




  50
  
  
    
)

  		




  
  45
  
    
try:

  		




  
  46
  
    
    from django.core.exceptions import email_re

  		




  
  47
  
    
except ImportError:

  		




  
  48
  
    
    # post Django 1.6

  		




  
  49
  
    
    validate_email = EmailValidator()

  		




  
  50
  
    
else:

  		




  
  51
  
    
    # pre Django 1.6

  		




  
  52
  
    
    validate_email = EmailValidator(

  		




  
  53
  
    
        email_re,

  		




  
  54
  
    
        _('Enter a valid email address.'),

  		




  
  55
  
    
        'invalid'

  		




  
  56
  
    
    )

  		




  51
  
  
    
-