aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests
diff options
context:
space:
mode:
Diffstat (limited to 'djangorestframework/tests')
-rw-r--r--djangorestframework/tests/parsers.py6
-rw-r--r--djangorestframework/tests/renderers.py4
-rw-r--r--djangorestframework/tests/request.py2
3 files changed, 5 insertions, 7 deletions
diff --git a/djangorestframework/tests/parsers.py b/djangorestframework/tests/parsers.py
index a85409dc..c9b6afd0 100644
--- a/djangorestframework/tests/parsers.py
+++ b/djangorestframework/tests/parsers.py
@@ -153,7 +153,7 @@ class TestFormParser(TestCase):
parser = FormParser()
stream = StringIO(self.string)
- (data, files) = parser.parse(stream)
+ data = parser.parse(stream)
self.assertEqual(Form(data).is_valid(), True)
@@ -203,10 +203,10 @@ class TestXMLParser(TestCase):
def test_parse(self):
parser = XMLParser()
- (data, files) = parser.parse(self._input)
+ data = parser.parse(self._input)
self.assertEqual(data, self._data)
def test_complex_data_parse(self):
parser = XMLParser()
- (data, files) = parser.parse(self._complex_data_input)
+ data = parser.parse(self._complex_data_input)
self.assertEqual(data, self._complex_data)
diff --git a/djangorestframework/tests/renderers.py b/djangorestframework/tests/renderers.py
index adf8d8fa..dc30f487 100644
--- a/djangorestframework/tests/renderers.py
+++ b/djangorestframework/tests/renderers.py
@@ -301,7 +301,7 @@ if YAMLRenderer:
parser = YAMLParser()
content = renderer.render(obj, 'application/yaml')
- (data, files) = parser.parse(StringIO(content))
+ data = parser.parse(StringIO(content))
self.assertEquals(obj, data)
@@ -392,7 +392,7 @@ class XMLRendererTestCase(TestCase):
content = StringIO(renderer.render(self._complex_data, 'application/xml'))
parser = XMLParser()
- complex_data_out, dummy = parser.parse(content)
+ complex_data_out = parser.parse(content)
error_msg = "complex data differs!IN:\n %s \n\n OUT:\n %s" % (repr(self._complex_data), repr(complex_data_out))
self.assertEqual(self._complex_data, complex_data_out, error_msg)
diff --git a/djangorestframework/tests/request.py b/djangorestframework/tests/request.py
index 85b2f418..1d74ea32 100644
--- a/djangorestframework/tests/request.py
+++ b/djangorestframework/tests/request.py
@@ -4,7 +4,6 @@ Tests for content parsing, and form-overloaded content parsing.
from django.conf.urls.defaults import patterns
from django.contrib.auth.models import User
from django.test import TestCase, Client
-from django.utils import simplejson as json
from djangorestframework import status
from djangorestframework.authentication import UserLoggedInAuthentication
@@ -13,7 +12,6 @@ from djangorestframework.parsers import (
FormParser,
MultiPartParser,
PlainTextParser,
- JSONParser
)
from djangorestframework.request import Request
from djangorestframework.response import Response