compat module simplified

Author: synasius

oauth2_provider/compat.py

@@ -1,3 +1,13 @@
+"""
+The `compat` module provides support for backwards compatibility with older
+versions of django and python..
+"""
+
+from __future__ import unicode_literals
+
+import django
+from django.conf import settings
+
 # urlparse in python3 has been renamed to urllib.parse
 try:
     from urlparse import urlparse, parse_qs
@@ -10,22 +20,7 @@
     from urllib.parse import urlencode
 
 # Django 1.5 add support for custom auth user model
-import django
-if django.VERSION >= (1, 5):
-    from django.conf import settings
-    if hasattr(settings, 'AUTH_USER_MODEL'):
-        User = settings.AUTH_USER_MODEL
-    else:
-        from django.contrib.auth.models import User
-else:
-    try:
-        from django.contrib.auth.models import User
-    except ImportError:
-        raise ImportError("User model is not to be found.")
-
 if django.VERSION >= (1, 5):
-    from django.contrib.auth import get_user_model
+    AUTH_USER_MODEL = settings.AUTH_USER_MODEL
 else:
-    def get_user_model():
-        from django.contrib.auth.models import User
-        return User
+    AUTH_USER_MODEL = 'auth.User'

oauth2_provider/models.py

@@ -9,7 +9,7 @@
 from django.core.exceptions import ImproperlyConfigured
 
 from .settings import oauth2_settings
-from .compat import User
+from .compat import AUTH_USER_MODEL
 from .generators import generate_client_secret, generate_client_id
 from .validators import validate_uris
 
@@ -57,7 +57,7 @@ class AbstractApplication(models.Model):
 
     client_id = models.CharField(max_length=100, unique=True,
                                  default=generate_client_id)
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(AUTH_USER_MODEL)
     help_text = _("Allowed URIs list, space separated")
     redirect_uris = models.TextField(help_text=help_text,
                                      validators=[validate_uris], blank=True)
@@ -129,7 +129,7 @@ class Grant(models.Model):
     * :attr:`redirect_uri` Self explained
     * :attr:`scope` Required scopes, optional
     """
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(AUTH_USER_MODEL)
     code = models.CharField(max_length=255)  # code comes from oauthlib
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
@@ -164,7 +164,7 @@ class AccessToken(models.Model):
                       :data:`settings.ACCESS_TOKEN_EXPIRE_SECONDS`
     * :attr:`scope` Allowed scopes
     """
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(AUTH_USER_MODEL)
     token = models.CharField(max_length=255)
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
@@ -216,7 +216,7 @@ class RefreshToken(models.Model):
     * :attr:`access_token` AccessToken instance this refresh token is
                            bounded to
     """
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(AUTH_USER_MODEL)
     token = models.CharField(max_length=255)
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     access_token = models.OneToOneField(AccessToken,