From b3698acb6c0b9eaa04189599e27014c788a75adc Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 22 Nov 2012 00:20:49 +0100
Subject: First passing test under p3k \o/

---
 rest_framework/tests/generics.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rest_framework/tests/generics.py')

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index a8279ef2..e4a4db80 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import simplejson as json
@@ -71,7 +73,7 @@ class TestRootView(TestCase):
                                content_type='application/json')
         response = self.view(request).render()
         self.assertEquals(response.status_code, status.HTTP_201_CREATED)
-        self.assertEquals(response.data, {'id': 4, 'text': u'foobar'})
+        self.assertEquals(response.data, {'id': 4, 'text': 'foobar'})
         created = self.objects.get(id=4)
         self.assertEquals(created.text, 'foobar')
 
@@ -126,7 +128,7 @@ class TestRootView(TestCase):
                                content_type='application/json')
         response = self.view(request).render()
         self.assertEquals(response.status_code, status.HTTP_201_CREATED)
-        self.assertEquals(response.data, {'id': 4, 'text': u'foobar'})
+        self.assertEquals(response.data, {'id': 4, 'text': 'foobar'})
         created = self.objects.get(id=4)
         self.assertEquals(created.text, 'foobar')
 
-- 
cgit v1.2.3


From 17000129e35b10c9d08497a669fd72f8233f065a Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Sat, 24 Nov 2012 23:19:03 +0100
Subject: Every (base) test should now pass with python3.

---
 rest_framework/tests/generics.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'rest_framework/tests/generics.py')

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index e4a4db80..b6d21847 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+import six
+
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import simplejson as json
@@ -189,7 +191,7 @@ class TestInstanceView(TestCase):
         request = factory.delete('/1')
         response = self.view(request, pk=1).render()
         self.assertEquals(response.status_code, status.HTTP_204_NO_CONTENT)
-        self.assertEquals(response.content, '')
+        self.assertEquals(response.content, six.b(''))
         ids = [obj.id for obj in self.objects.all()]
         self.assertEquals(ids, [2, 3])
 
-- 
cgit v1.2.3


From 60250f22c8e144494f372338c16a2167cccb319d Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 3 Jan 2013 11:41:07 +0100
Subject: Move the various compat things to the compat module.

---
 rest_framework/tests/generics.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'rest_framework/tests/generics.py')

diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index a877574e..215de0c4 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -1,14 +1,12 @@
 from __future__ import unicode_literals
 
-import six
-
 from django.db import models
 from django.test import TestCase
 from django.test.client import RequestFactory
 from django.utils import simplejson as json
 from rest_framework import generics, serializers, status
 from rest_framework.tests.models import BasicModel, Comment, SlugBasedModel
-
+from rest_framework.compat import six
 
 factory = RequestFactory()
 
-- 
cgit v1.2.3