Skip to content
This repository was archived by the owner on May 26, 2020. It is now read-only.

Commit ab97ba5

Browse files
committed
Remove compat.get_user_model.
This method is not needed because support for Django 1.5 is not required.
1 parent 93c5ece commit ab97ba5

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

rest_framework_jwt/authentication.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import jwt
22

3+
from django.contrib.auth import get_user_model
34
from django.utils.encoding import smart_text
45
from django.utils.translation import ugettext as _
56
from rest_framework import exceptions
67
from rest_framework.authentication import (
78
BaseAuthentication, get_authorization_header
89
)
910

10-
from rest_framework_jwt.compat import get_user_model
1111
from rest_framework_jwt.settings import api_settings
1212

1313

rest_framework_jwt/compat.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from django.contrib.auth import get_user_model
12
from distutils.version import StrictVersion
23

34
import rest_framework
@@ -32,17 +33,6 @@ def __init__(self, *args, **kwargs):
3233
super(PasswordField, self).__init__(*args, **kwargs)
3334

3435

35-
def get_user_model():
36-
try:
37-
from django.contrib.auth import get_user_model
38-
except ImportError: # Django < 1.5
39-
from django.contrib.auth.models import User
40-
else:
41-
User = get_user_model()
42-
43-
return User
44-
45-
4636
def get_username_field():
4737
try:
4838
username_field = get_user_model().USERNAME_FIELD

rest_framework_jwt/serializers.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
from calendar import timegm
44
from datetime import datetime, timedelta
55

6-
from django.contrib.auth import authenticate
6+
from django.contrib.auth import authenticate, get_user_model
77
from django.utils.translation import ugettext as _
88
from rest_framework import serializers
99
from .compat import Serializer
1010

1111
from rest_framework_jwt.settings import api_settings
12-
from rest_framework_jwt.compat import (
13-
get_user_model, get_username_field, PasswordField
14-
)
12+
from rest_framework_jwt.compat import get_username_field, PasswordField
1513

1614

1715
User = get_user_model()

0 commit comments

Comments
 (0)