aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/authtoken
diff options
context:
space:
mode:
authorMax Peterson2014-04-28 12:35:55 +0100
committerMax Peterson2014-04-28 12:35:55 +0100
commit1c777ffe8b67c342bc1b27fefe67d1094a2f6b07 (patch)
treef2a84ac17d4a8c442e079f7104a23f14402d576c /rest_framework/authtoken
parent4a1ef6d4b15c504881662a2667564394cb333b6b (diff)
downloaddjango-rest-framework-1c777ffe8b67c342bc1b27fefe67d1094a2f6b07.tar.bz2
Ensure Token.generate_key returns a string.
Diffstat (limited to 'rest_framework/authtoken')
-rw-r--r--rest_framework/authtoken/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py
index 8eac2cc4..167fa531 100644
--- a/rest_framework/authtoken/models.py
+++ b/rest_framework/authtoken/models.py
@@ -34,7 +34,7 @@ class Token(models.Model):
return super(Token, self).save(*args, **kwargs)
def generate_key(self):
- return binascii.hexlify(os.urandom(20))
+ return binascii.hexlify(os.urandom(20)).decode()
def __unicode__(self):
return self.key