diff options
Diffstat (limited to 'rest_framework/authtoken')
| -rw-r--r-- | rest_framework/authtoken/models.py | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index db21d44c..a1a9315f 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,7 +1,9 @@  import binascii  import os +  from django.conf import settings  from django.db import models +from django.utils.encoding import python_2_unicode_compatible  # Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist. @@ -11,6 +13,7 @@ from django.db import models  AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') +@python_2_unicode_compatible  class Token(models.Model):      """      The default authorization token model. @@ -35,5 +38,5 @@ class Token(models.Model):      def generate_key(self):          return binascii.hexlify(os.urandom(20)).decode() -    def __unicode__(self): +    def __str__(self):          return self.key | 
