From 1c777ffe8b67c342bc1b27fefe67d1094a2f6b07 Mon Sep 17 00:00:00 2001
From: Max Peterson
Date: Mon, 28 Apr 2014 12:35:55 +0100
Subject: Ensure Token.generate_key returns a string.

---
 rest_framework/authtoken/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/authtoken/models.py')

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
-- 
cgit v1.2.3


From bf09c32de8f9d528f83e9cb7a2773d1f4c9ab563 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 19 Aug 2014 13:28:07 +0100
Subject: Code linting and added runtests.py

---
 rest_framework/authtoken/models.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'rest_framework/authtoken/models.py')

diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py
index 167fa531..db21d44c 100644
--- a/rest_framework/authtoken/models.py
+++ b/rest_framework/authtoken/models.py
@@ -1,6 +1,5 @@
 import binascii
 import os
-from hashlib import sha1
 from django.conf import settings
 from django.db import models
 
-- 
cgit v1.2.3