bump release to 2.1.5

authentic2/__init__.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-__version__ = "2.1.4"
+__version__ = "2.1.5"
 
 # vendor contains incorporated dependencies
 sys.path.append(os.path.join(os.path.dirname(__file__), 'vendor'))

authentic2/fix_user_model.py

@@ -3,7 +3,7 @@ import re
 from django.utils.translation import ugettext_lazy as _
 from django.core.validators import MaxLengthValidator, RegexValidator
 from django.db.models.signals import class_prepared
-from django.db.models import FieldDoesNotExist
+from django.db.models.fields import FieldDoesNotExist
 from django.contrib.auth import forms
 from django.contrib.auth import get_user_model
 

authentic2/registration_backend/forms.py

@@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from django.forms import Form, CharField, PasswordInput
 from django.utils.datastructures import SortedDict
-from django.db.models import FieldDoesNotExist
+from django.db.models.fields import FieldDoesNotExist
 
 
 from .. import app_settings, compat, forms, utils

authentic2/registration_backend/views.py

@@ -9,7 +9,7 @@ from django.contrib.sites.models import RequestSite
 from django.contrib.sites.models import Site
 from django.contrib.auth.models import BaseUserManager, Group
 from django.conf import settings
-from django.db.models import FieldDoesNotExist
+from django.db.models.fields import FieldDoesNotExist
 
 
 from registration.views import RegistrationView as BaseRegistrationView

authentic2/validators.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 import smtplib
 
 from django.utils.translation import ugettext_lazy as _
-from django.core.validators import EmailValidator, email_re
+from django.core.validators import EmailValidator
 from django.core.exceptions import ValidationError
 
 import dns.resolver
@@ -42,9 +42,15 @@ class EmailValidator(EmailValidator):
         except dns.resolver.NoAnswer:
             raise ValidationError(_('Nonexistent email address.'))
 
-
-validate_email = EmailValidator(
-    email_re,
-    _('Enter a valid email address.'),
-    'invalid'
-)
+try:
+    from django.core.exceptions import email_re
+except ImportError:
+    # post Django 1.6
+    validate_email = EmailValidator()
+else:
+    # pre Django 1.6
+    validate_email = EmailValidator(
+        email_re,
+        _('Enter a valid email address.'),
+        'invalid'
+    )

authentic2/views.py

@@ -27,7 +27,7 @@ from django.http import (HttpResponseRedirect, HttpResponseForbidden,
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.cache import never_cache
 from django.contrib.auth.decorators import login_required
-from django.db.models import FieldDoesNotExist
+from django.db.models.fields import FieldDoesNotExist
 
 
 # FIXME: this decorator has nothing to do with an idp, should be moved in the