aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTom Christie2011-04-25 04:50:28 +0100
committerTom Christie2011-04-25 04:50:28 +0100
commit762a52edde09297e87c640797219c9bb8255d50a (patch)
treec68aff4f73e988fd2ee2cec827bd3ec528fa6e22 /examples
parent84a4fd3ea11a55441cb5b8acd584c76fc325edcc (diff)
downloaddjango-rest-framework-762a52edde09297e87c640797219c9bb8255d50a.tar.bz2
Fix some compat issues with json/simplejson
Diffstat (limited to 'examples')
-rw-r--r--examples/blogpost/tests.py13
-rw-r--r--examples/pygments_api/tests.py8
2 files changed, 9 insertions, 12 deletions
diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py
index dfb4d5f5..14b0914d 100644
--- a/examples/blogpost/tests.py
+++ b/examples/blogpost/tests.py
@@ -1,13 +1,15 @@
"""Test a range of REST API usage of the example application.
"""
-from django.test import TestCase
from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.utils import simplejson as json
+
+from djangorestframework.compat import RequestFactory
+
from blogpost import views, models
import blogpost
-#import json
-#from rest.utils import xml2dict, dict2xml
class AcceptHeaderTests(TestCase):
"""Test correct behaviour of the Accept header as specified by RFC 2616:
@@ -164,11 +166,6 @@ class AllowedMethodsTests(TestCase):
#above testcases need to probably moved to the core
-from djangorestframework.compat import RequestFactory
-try:
- import json
-except ImportError:
- import simplejson as json
class TestRotation(TestCase):
"""For the example the maximum amount of Blogposts is capped off at views.MAX_POSTS.
diff --git a/examples/pygments_api/tests.py b/examples/pygments_api/tests.py
index 017823b9..a8f085cf 100644
--- a/examples/pygments_api/tests.py
+++ b/examples/pygments_api/tests.py
@@ -1,12 +1,12 @@
from django.test import TestCase
+from django.utils import simplejson as json
+
from djangorestframework.compat import RequestFactory
+
from pygments_api import views
import tempfile, shutil
-try:
- import json
-except ImportError:
- import simplejson as json
+
class TestPygmentsExample(TestCase):