Merge pull request #113 from davidfischer-ch/fix-deprecated-warnings

Fix deprecation warnings with Django 1.7+

Author: Massimiliano Pippi

AUTHORS

@@ -4,4 +4,9 @@ Authors
 Massimiliano Pippi
 Federico Frenguelli
 Stéphane Raimbault
-Emanuele Palazzetti
+Emanuele Palazzetti
+
+Contributors
+============
+
+David Fischer

oauth2_provider/models.py

@@ -3,7 +3,12 @@
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils import timezone
-from django.db.models import get_model
+try:
+    # Django's new application loading system
+    from django.apps import apps
+    get_model = apps.get_model
+except ImportError:
+    from django.db.models import get_model
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import python_2_unicode_compatible
 from django.core.exceptions import ImproperlyConfigured

oauth2_provider/settings.py

@@ -20,7 +20,11 @@
 import six
 
 from django.conf import settings
-from django.utils import importlib
+try:
+    # Available in Python 2.7+
+    import importlib
+except ImportError:
+    from django.utils import importlib
 
 
 USER_SETTINGS = getattr(settings, 'OAUTH2_PROVIDER', None)