Cleanup after pull request

Author: jpadilla

rest_framework_jwt/authentication.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from rest_framework import exceptions
 from rest_framework.authentication import (BaseAuthentication,
                                            get_authorization_header)
@@ -8,10 +7,10 @@
 
 try:
     from django.contrib.auth import get_user_model
-except ImportError: # django < 1.5
-    from django.contrib.auth.models import User as UserModel
+except ImportError:  # Django < 1.5
+    from django.contrib.auth.models import User
 else:
-    UserModel = get_user_model()
+    User = get_user_model()
 
 
 jwt_decode_handler = api_settings.DEFAULT_JWT_DECODE_HANDLER
@@ -66,8 +65,8 @@ def authenticate_credentials(self, user_id, email):
         Returns an active user that matches the payload's user id and email.
         """
         try:
-            user = UserModel.objects.get(pk=user_id, email=email, is_active=True)
-        except UserModel.DoesNotExist:
+            user = User.objects.get(pk=user_id, email=email, is_active=True)
+        except User.DoesNotExist:
             msg = 'Invalid signature'
             raise exceptions.AuthenticationFailed(msg)