From 2d8739115c8b82267f1006f636f05b116539e0dd Mon Sep 17 00:00:00 2001 From: Ben Timby Date: Mon, 23 Jan 2012 13:18:38 -0500 Subject: [PATCH 1/2] Fix for testcase test_with_content_type_args --- djangorestframework/tests/renderers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py index 84e4390b8..adb46f7fa 100644 --- a/djangorestframework/tests/renderers.py +++ b/djangorestframework/tests/renderers.py @@ -172,7 +172,7 @@ class RendererIntegrationTests(TestCase): self.assertEquals(resp.status_code, DUMMYSTATUS) _flat_repr = '{"foo": ["bar", "baz"]}' -_indented_repr = '{\n "foo": [\n "bar", \n "baz"\n ]\n}' +_indented_repr = '{\n "foo": [\n "bar",\n "baz"\n ]\n}' class JSONRendererTests(TestCase): From 54caf6d7ba8b53cb74774535f2ecd8584a9b2cfd Mon Sep 17 00:00:00 2001 From: Ben Timby Date: Tue, 24 Jan 2012 14:34:29 -0500 Subject: [PATCH 2/2] Modified test case to pass regardless of JSON library --- djangorestframework/tests/renderers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py index adb46f7fa..77b5430fa 100644 --- a/djangorestframework/tests/renderers.py +++ b/djangorestframework/tests/renderers.py @@ -1,3 +1,5 @@ +import re + from django.conf.urls.defaults import patterns, url from django.test import TestCase @@ -187,6 +189,8 @@ class JSONRendererTests(TestCase): obj = {'foo': ['bar', 'baz']} renderer = JSONRenderer(None) content = renderer.render(obj, 'application/json') + # Fix failing test case which depends on version of JSON library. + content = re.sub(' +\n', '\n', content) self.assertEquals(content, _flat_repr) def test_with_content_type_args(self):