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/response.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index d7b75450..237b12a9 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -1,4 +1,5 @@
 import unittest
+import six
 
 from django.conf.urls.defaults import patterns, url, include
 from django.test import TestCase
@@ -25,8 +26,8 @@ class MockJsonRenderer(BaseRenderer):
 DUMMYSTATUS = status.HTTP_200_OK
 DUMMYCONTENT = 'dummycontent'
 
-RENDERER_A_SERIALIZER = lambda x: 'Renderer A: %s' % x
-RENDERER_B_SERIALIZER = lambda x: 'Renderer B: %s' % x
+RENDERER_A_SERIALIZER = lambda x: ('Renderer A: %s' % x).encode('ascii')
+RENDERER_B_SERIALIZER = lambda x: ('Renderer B: %s' % x).encode('ascii')
 
 
 class RendererA(BaseRenderer):
@@ -95,7 +96,7 @@ class RendererIntegrationTests(TestCase):
         resp = self.client.head('/')
         self.assertEquals(resp.status_code, DUMMYSTATUS)
         self.assertEquals(resp['Content-Type'], RendererA.media_type)
-        self.assertEquals(resp.content, '')
+        self.assertEquals(resp.content, six.b(''))
 
     def test_default_renderer_serializes_content_on_accept_any(self):
         """If the Accept header is set to */* the default renderer should serialize the response."""
-- 
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/response.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/rest_framework/tests/response.py b/rest_framework/tests/response.py
index fd153f40..453488d0 100644
--- a/rest_framework/tests/response.py
+++ b/rest_framework/tests/response.py
@@ -1,6 +1,3 @@
-import unittest
-import six
-
 from django.test import TestCase
 from rest_framework.compat import patterns, url, include
 from rest_framework.response import Response
@@ -12,6 +9,7 @@ from rest_framework.renderers import (
     BrowsableAPIRenderer
 )
 from rest_framework.settings import api_settings
+from rest_framework.compat import six
 
 
 class MockPickleRenderer(BaseRenderer):
-- 
cgit v1.2.3