Added proper charset support

1 files changed, 5 insertions, 23 deletions

diff --git a/rest_framework/tests/negotiation.py b/rest_framework/tests/negotiation.py
index d7ef6470..7f84827f 100644
--- a/rest_framework/tests/negotiation.py
+++ b/rest_framework/tests/negotiation.py
@@ -12,15 +12,14 @@ factory = RequestFactory()
 class MockJSONRenderer(BaseRenderer):
     media_type = 'application/json'
 
+
 class MockHTMLRenderer(BaseRenderer):
     media_type = 'text/html'
 
+
 class NoCharsetSpecifiedRenderer(BaseRenderer):
     media_type = 'my/media'
 
-class CharsetSpecifiedRenderer(BaseRenderer):
-    media_type = 'my/media'
-    charset = 'mycharset'
 
 class TestAcceptedMediaType(TestCase):
     def setUp(self):
@@ -32,32 +31,15 @@ class TestAcceptedMediaType(TestCase):
 
     def test_client_without_accept_use_renderer(self):
         request = Request(factory.get('/'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_underspecifies_accept_use_renderer(self):
         request = Request(factory.get('/', HTTP_ACCEPT='*/*'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json')
 
     def test_client_overspecifies_accept_use_client(self):
         request = Request(factory.get('/', HTTP_ACCEPT='application/json; indent=8'))
-        accepted_renderer, accepted_media_type, charset = self.select_renderer(request)
+        accepted_renderer, accepted_media_type = self.select_renderer(request)
         self.assertEqual(accepted_media_type, 'application/json; indent=8')
-        
-class TestCharset(TestCase):
-    def setUp(self):
-        self.renderers = [NoCharsetSpecifiedRenderer()]
-        self.negotiator = DefaultContentNegotiation()
-    
-    def test_returns_none_if_no_charset_set(self):
-        request = Request(factory.get('/'))
-        renderers = [NoCharsetSpecifiedRenderer()]
-        _, _, charset = self.negotiator.select_renderer(request, renderers)
-        self.assertIsNone(charset)
-    
-    def test_returns_attribute_from_renderer_if_charset_is_set(self):
-        request = Request(factory.get('/'))
-        renderers = [CharsetSpecifiedRenderer()]
-        _, _, charset =  self.negotiator.select_renderer(request, renderers)
-        self.assertEquals(CharsetSpecifiedRenderer.charset, charset)
\ No newline at end of file