From 7dca49cb1814bcbcae9c51e0f15ac35f0d1c242f Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Tue, 7 Jun 2016 15:59:55 +0600 Subject: [PATCH] removed AUTH_USER_MODEL compat property --- rest_framework/authtoken/models.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 50db18103..5e562b135 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,17 +1,11 @@ import binascii import os -from django.conf import settings +from django.conf import AUTH_USER_MODEL from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ -# Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist. -# Note that we don't perform this code in the compat module due to -# bug report #1297 -# See: https://github.com/tomchristie/django-rest-framework/issues/1297 -AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') - @python_2_unicode_compatible class Token(models.Model): @@ -19,8 +13,10 @@ class Token(models.Model): The default authorization token model. """ key = models.CharField(_("Key"), max_length=40, primary_key=True) - user = models.OneToOneField(AUTH_USER_MODEL, related_name='auth_token', - on_delete=models.CASCADE, verbose_name=_("User")) + user = models.OneToOneField( + AUTH_USER_MODEL, related_name='auth_token', + on_delete=models.CASCADE, verbose_name=_("User") + ) created = models.DateTimeField(_("Created"), auto_now_add=True) class Meta: