stay compatible with Django 1.4, remove all direct uses of get_user_model

authentic2/admin_forms.py

@@ -1,12 +1,17 @@
 from django import forms
 
+
 from django.contrib.auth.forms import UserChangeForm as AuthUserChangeForm, UserCreationForm as AuthUserCreationForm
-from django.contrib.auth import get_user_model
+
+
+from authentic2.compat import get_user_model
+
 
 class UserChangeForm(AuthUserChangeForm):
     class Meta(AuthUserChangeForm.Meta):
         model = get_user_model()
 
+
 class UserCreationForm(AuthUserCreationForm):
     class Meta(AuthUserCreationForm.Meta):
         model = get_user_model()

authentic2/backends.py

@@ -8,7 +8,6 @@ import random
 log = logging.getLogger(__name__)
 
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 try:
     import lasso
@@ -16,6 +15,9 @@ except ImportError:
     pass
 
 
+from authentic2.compat import get_user_model
+
+
 class LDAPBackendError(Exception):
     pass
 

authentic2/forms.py

@@ -1,5 +1,7 @@
 from django import forms
-from django.contrib.auth import get_user_model
+
+
+from authentic2.compat import get_user_model
 
 
 class UserProfileForm(forms.ModelForm):

authentic2/idp/idp_cas/tests.py

@@ -1,12 +1,15 @@
 from xml.etree import ElementTree as ET
 
+
 from django.test import TestCase
-from django.contrib.auth import get_user_model
 from django.test.client import RequestFactory
 
-from models import CasTicket
-import views
-import constants
+
+from authentic2.compat import get_user_model
+from .models import CasTicket
+from . import views
+from . import constants
+
 
 class CasTests(TestCase):
     LOGIN = 'test'

authentic2/registration_backend/forms.py

@@ -1,11 +1,13 @@
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth import get_user_model
 from django import forms
 
 
 from registration.forms import RegistrationForm as BaseRegistrationForm
 
 
+from authentic2.compat import get_user_model
+
+
 class RegistrationForm(BaseRegistrationForm):
     error_css_class = 'form-field-error'
     required_css_class = 'form-field-required'

authentic2/views.py

@@ -10,7 +10,6 @@ from django.conf import settings
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.views.generic.edit import UpdateView
-from django.contrib.auth import get_user_model
 from django.shortcuts import get_object_or_404
 from django.contrib.auth import SESSION_KEY
 from django import http
@@ -19,6 +18,7 @@ from django import http
 from authentic2.idp.decorators import prevent_access_to_transient_users
 from authentic2.idp.saml import saml2_endpoints
 from authentic2.saml import models as saml_models
+from authentic2.compat import get_user_model
 
 
 import forms