removed old compatibility code for django < 1.8

synasius · synasius · commit e8e7980e491c · 2016-03-11T15:02:23.000+01:00
diff --git a/oauth2_provider/backends.py b/oauth2_provider/backends.py
@@ -1,6 +1,8 @@
-from .compat import get_user_model
+from django.contrib.auth import get_user_model
+
 from .oauth2_backends import get_oauthlib_core
 
+
 UserModel = get_user_model()
 OAuthLibCore = get_oauthlib_core()
 
diff --git a/oauth2_provider/compat.py b/oauth2_provider/compat.py
@@ -1,13 +1,10 @@
 """
 The `compat` module provides support for backwards compatibility with older
-versions of django and python..
+versions of django and python.
 """
 # flake8: noqa
 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, parse_qsl, urlunparse
@@ -18,28 +15,3 @@
     from urllib import urlencode, unquote_plus
 except ImportError:
     from urllib.parse import urlencode, unquote_plus
-
-# Django 1.5 add support for custom auth user model
-if django.VERSION >= (1, 5):
-    AUTH_USER_MODEL = settings.AUTH_USER_MODEL
-else:
-    AUTH_USER_MODEL = 'auth.User'
-
-try:
-    from django.contrib.auth import get_user_model
-except ImportError:
-    from django.contrib.auth.models import User
-    get_user_model = lambda: User
-
-# Django's new application loading system
-try:
-    from django.apps import apps
-    get_model = apps.get_model
-except ImportError:
-    from django.db.models import get_model
-
-# Django 1.5 add the support of context variables for the url template tag
-if django.VERSION >= (1, 5):
-    from django.template.defaulttags import url
-else:
-    from django.templatetags.future import url
diff --git a/oauth2_provider/models.py b/oauth2_provider/models.py
@@ -2,6 +2,8 @@
 
 from datetime import timedelta
 
+from django.apps import apps
+from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.utils import timezone
@@ -11,7 +13,7 @@
 from django.core.exceptions import ImproperlyConfigured
 
 from .settings import oauth2_settings
-from .compat import AUTH_USER_MODEL, parse_qsl, urlparse, get_model
+from .compat import parse_qsl, urlparse
 from .generators import generate_client_secret, generate_client_id
 from .validators import validate_uris
 
@@ -57,7 +59,7 @@ class AbstractApplication(models.Model):
 
     client_id = models.CharField(max_length=100, unique=True,
                                  default=generate_client_id, db_index=True)
-    user = models.ForeignKey(AUTH_USER_MODEL, related_name="%(app_label)s_%(class)s")
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name="%(app_label)s_%(class)s")
     help_text = _("Allowed URIs list, space separated")
     redirect_uris = models.TextField(help_text=help_text,
                                      validators=[validate_uris], blank=True)
@@ -146,7 +148,7 @@ class Grant(models.Model):
     * :attr:`redirect_uri` Self explained
     * :attr:`scope` Required scopes, optional
     """
-    user = models.ForeignKey(AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
     code = models.CharField(max_length=255, db_index=True)  # code comes from oauthlib
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
@@ -183,7 +185,7 @@ class AccessToken(models.Model):
     * :attr:`expires` Date and time of token expiration, in DateTime format
     * :attr:`scope` Allowed scopes
     """
-    user = models.ForeignKey(AUTH_USER_MODEL, blank=True, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True)
     token = models.CharField(max_length=255, db_index=True)
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     expires = models.DateTimeField()
@@ -252,7 +254,7 @@ class RefreshToken(models.Model):
     * :attr:`access_token` AccessToken instance this refresh token is
                            bounded to
     """
-    user = models.ForeignKey(AUTH_USER_MODEL)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL)
     token = models.CharField(max_length=255, db_index=True)
     application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL)
     access_token = models.OneToOneField(AccessToken,
@@ -276,7 +278,7 @@ def get_application_model():
     except ValueError:
         e = "APPLICATION_MODEL must be of the form 'app_label.model_name'"
         raise ImproperlyConfigured(e)
-    app_model = get_model(app_label, model_name)
+    app_model = apps.get_model(app_label, model_name)
     if app_model is None:
         e = "APPLICATION_MODEL refers to model {0} that has not been installed"
         raise ImproperlyConfigured(e.format(oauth2_settings.APPLICATION_MODEL))
diff --git a/oauth2_provider/templates/oauth2_provider/application_confirm_delete.html b/oauth2_provider/templates/oauth2_provider/application_confirm_delete.html
@@ -1,7 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 {% block content %}
     <div class="block-center">
         <h3 class="block-center-heading">{% trans "Are you sure to delete the application" %} {{ application.name }}?</h3>
@@ -16,4 +15,4 @@ <h3 class="block-center-heading">{% trans "Are you sure to delete the applicatio
             </div>
         </form>
     </div>
-{% endblock content %}
+{% endblock content %}
diff --git a/oauth2_provider/templates/oauth2_provider/application_detail.html b/oauth2_provider/templates/oauth2_provider/application_detail.html
@@ -1,7 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 {% block content %}
     <div class="block-center">
         <h3 class="block-center-heading">{{ application.name }}</h3>
@@ -39,4 +38,4 @@ <h3 class="block-center-heading">{{ application.name }}</h3>
             <a class="btn btn-danger" href="{% url "oauth2_provider:delete" application.id %}">{% trans "Delete" %}</a>
         </div>
     </div>
-{% endblock content %}
+{% endblock content %}
diff --git a/oauth2_provider/templates/oauth2_provider/application_form.html b/oauth2_provider/templates/oauth2_provider/application_form.html
@@ -1,7 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 {% block content %}
     <div class="block-center">
         <form class="form-horizontal" method="post" action="{% block app-form-action-url %}{% url 'oauth2_provider:update' application.id %}{% endblock app-form-action-url %}">
@@ -40,4 +39,4 @@ <h3 class="block-center-heading">
             </div>
         </form>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/oauth2_provider/templates/oauth2_provider/application_list.html b/oauth2_provider/templates/oauth2_provider/application_list.html
@@ -1,7 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 {% block content %}
     <div class="block-center">
         <h3 class="block-center-heading">{% trans "Your applications" %}</h3>
@@ -17,4 +16,4 @@ <h3 class="block-center-heading">{% trans "Your applications" %}</h3>
             <p>{% trans "No applications defined" %}. <a href="{% url 'oauth2_provider:register' %}">{% trans "Click here" %}</a> {% trans "if you want to register a new one" %}</p>
         {% endif %}
     </div>
-{% endblock content %}
+{% endblock content %}
diff --git a/oauth2_provider/templates/oauth2_provider/application_registration_form.html b/oauth2_provider/templates/oauth2_provider/application_registration_form.html
@@ -1,10 +1,9 @@
 {% extends "oauth2_provider/application_form.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 
 {% block app-form-title %}{% trans "Register a new application" %}{% endblock app-form-title %}
 
 {% block app-form-action-url %}{% url 'oauth2_provider:register' %}{% endblock app-form-action-url %}
 
-{% block app-form-back-url %}{% url "oauth2_provider:list" %}"{% endblock app-form-back-url %}
+{% block app-form-back-url %}{% url "oauth2_provider:list" %}"{% endblock app-form-back-url %}
diff --git a/oauth2_provider/templates/oauth2_provider/authorized-tokens.html b/oauth2_provider/templates/oauth2_provider/authorized-tokens.html
@@ -1,7 +1,6 @@
 {% extends "oauth2_provider/base.html" %}
 
 {% load i18n %}
-{% load url from compat %}
 {% block content %}
     <div class="block-center">
     <h1>{% trans "Tokens" %}</h1>
diff --git a/oauth2_provider/templatetags/__init__.py b/oauth2_provider/templatetags/__init__.py
diff --git a/oauth2_provider/templatetags/compat.py b/oauth2_provider/templatetags/compat.py
diff --git a/oauth2_provider/tests/test_application_views.py b/oauth2_provider/tests/test_application_views.py
@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
 from ..models import get_application_model
-from ..compat import get_user_model
+
 
 Application = get_application_model()
 UserModel = get_user_model()
diff --git a/oauth2_provider/tests/test_auth_backends.py b/oauth2_provider/tests/test_auth_backends.py
@@ -1,11 +1,11 @@
+from django.conf.global_settings import MIDDLEWARE_CLASSES
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AnonymousUser
 from django.test import TestCase, RequestFactory
 from django.test.utils import override_settings
-from django.contrib.auth.models import AnonymousUser
 from django.utils.timezone import now, timedelta
-from django.conf.global_settings import MIDDLEWARE_CLASSES
 from django.http import HttpResponse
 
-from ..compat import get_user_model
 from ..models import get_application_model
 from ..models import AccessToken
 from ..backends import OAuth2Backend
diff --git a/oauth2_provider/tests/test_authorization_code.py b/oauth2_provider/tests/test_authorization_code.py
@@ -5,11 +5,12 @@
 import datetime
 import mock
 
-from django.test import TestCase, RequestFactory
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
-from ..compat import urlparse, parse_qs, urlencode, get_user_model
+from ..compat import urlparse, parse_qs, urlencode
 from ..models import get_application_model, Grant, AccessToken, RefreshToken
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
diff --git a/oauth2_provider/tests/test_client_credential.py b/oauth2_provider/tests/test_client_credential.py
@@ -8,6 +8,7 @@
     import urllib
 
 from django.core.urlresolvers import reverse
+from django.contrib.auth import get_user_model
 from django.test import TestCase, RequestFactory
 from django.views.generic import View
 
@@ -19,7 +20,6 @@
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
 from ..views.mixins import OAuthLibMixin
-from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
diff --git a/oauth2_provider/tests/test_decorators.py b/oauth2_provider/tests/test_decorators.py
@@ -1,12 +1,12 @@
 from datetime import timedelta
 
+from django.contrib.auth import get_user_model
 from django.test import TestCase, RequestFactory
 from django.utils import timezone
 
 from ..decorators import protected_resource, rw_protected_resource
 from ..settings import oauth2_settings
 from ..models import get_application_model, AccessToken
-from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
diff --git a/oauth2_provider/tests/test_implicit.py b/oauth2_provider/tests/test_implicit.py
@@ -1,10 +1,10 @@
 from __future__ import unicode_literals
 
-
-from django.test import TestCase, RequestFactory
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+from django.test import TestCase, RequestFactory
 
-from ..compat import urlparse, parse_qs, urlencode, get_user_model
+from ..compat import urlparse, parse_qs, urlencode
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
diff --git a/oauth2_provider/tests/test_models.py b/oauth2_provider/tests/test_models.py
@@ -1,18 +1,15 @@
 from __future__ import unicode_literals
 
-try:
-    from unittest import skipIf
-except ImportError:
-    from django.utils.unittest.case import skipIf
+from unittest import skipIf
 
 import django
+from django.contrib.auth import get_user_model
+from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.core.exceptions import ValidationError
 from django.utils import timezone
 
 from ..models import get_application_model, Grant, AccessToken, RefreshToken
-from ..compat import get_user_model
 
 
 Application = get_application_model()
diff --git a/oauth2_provider/tests/test_oauth2_validators.py b/oauth2_provider/tests/test_oauth2_validators.py
@@ -1,11 +1,11 @@
+from django.contrib.auth import get_user_model
 from django.test import TestCase
 
 import mock
 from oauthlib.common import Request
 
 from ..oauth2_validators import OAuth2Validator
 from ..models import get_application_model
-from ..compat import get_user_model
 
 UserModel = get_user_model()
 AppModel = get_application_model()
diff --git a/oauth2_provider/tests/test_password.py b/oauth2_provider/tests/test_password.py
@@ -2,13 +2,13 @@
 
 import json
 
-from django.test import TestCase, RequestFactory
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+from django.test import TestCase, RequestFactory
 
 from ..models import get_application_model
 from ..settings import oauth2_settings
 from ..views import ProtectedResourceView
-from ..compat import get_user_model
 from .test_utils import TestCaseUtils
 
 
diff --git a/oauth2_provider/tests/test_rest_framework.py b/oauth2_provider/tests/test_rest_framework.py
@@ -1,19 +1,15 @@
+import unittest
 from datetime import timedelta
 
 from django.conf.urls import patterns, url, include
+from django.contrib.auth import get_user_model
 from django.http import HttpResponse
 from django.test import TestCase
 from django.utils import timezone
 
-try:
-    from django.utils import unittest
-except ImportError:
-    import unittest
-
 from .test_utils import TestCaseUtils
 from ..models import AccessToken, get_application_model
 from ..settings import oauth2_settings
-from ..compat import get_user_model
 
 
 Application = get_application_model()
diff --git a/oauth2_provider/tests/test_scopes.py b/oauth2_provider/tests/test_scopes.py
@@ -2,16 +2,18 @@
 
 import json
 
-from django.test import TestCase, RequestFactory
+from django.contrib.auth import get_user_model
 from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
+from django.test import TestCase, RequestFactory
 
 from .test_utils import TestCaseUtils
-from ..compat import urlparse, parse_qs, get_user_model, urlencode
+from ..compat import urlparse, parse_qs, urlencode
 from ..models import get_application_model, Grant, AccessToken
 from ..settings import oauth2_settings
 from ..views import ScopedProtectedResourceView, ReadWriteScopedResourceView
 
+
 Application = get_application_model()
 UserModel = get_user_model()
 
diff --git a/oauth2_provider/tests/test_token_revocation.py b/oauth2_provider/tests/test_token_revocation.py
diff --git a/oauth2_provider/tests/test_token_view.py b/oauth2_provider/tests/test_token_view.py
