From 762a52edde09297e87c640797219c9bb8255d50a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 25 Apr 2011 04:50:28 +0100
Subject: Fix some compat issues with json/simplejson

---
 examples/blogpost/tests.py     | 13 +++++--------
 examples/pygments_api/tests.py |  8 ++++----
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'examples')

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):
 
-- 
cgit v1.2.3