Use utils.get_user_model()

Author: jpadilla

rest_framework_jwt/authentication.py

@@ -5,6 +5,7 @@
 from rest_framework.authentication import (BaseAuthentication,
                                            get_authorization_header)
 
+from rest_framework_jwt import utils
 from rest_framework_jwt.settings import api_settings
 
 
@@ -60,12 +61,8 @@ def authenticate_credentials(self, payload):
         """
         Returns an active user that matches the payload's user id and email.
         """
-        try:
-            from django.contrib.auth import get_user_model
-        except ImportError:  # Django < 1.5
-            from django.contrib.auth.models import User
-        else:
-            User = get_user_model()
+        User = utils.get_user_model()
+
         try:
             user_id = jwt_get_user_id_from_payload(payload)
 

rest_framework_jwt/compat.py

@@ -1,6 +1,7 @@
 import rest_framework
 from distutils.version import StrictVersion
 
+
 if StrictVersion(rest_framework.VERSION) < StrictVersion('3.0.0'):
     from rest_framework.serializers import Serializer
 else:

rest_framework_jwt/utils.py

@@ -7,7 +7,7 @@
 def get_user_model():
     try:
         from django.contrib.auth import get_user_model
-    except ImportError:  # django < 1.5
+    except ImportError:  # Django < 1.5
         from django.contrib.auth.models import User
     else:
         User = get_user_model()