From 3d15adaeb11a2f2f2961280026232743afc61398 Mon Sep 17 00:00:00 2001
From: tom christie tom@tomchristie.com
Date: Tue, 26 Apr 2011 20:20:31 +0100
Subject: Fixes #35 - Import json from django's built-in package (Does
 cleverness in determing best lib to use)

---
 examples/blogpost/tests.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'examples/blogpost/tests.py')

diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py
index dfb4d5f5..d4084e72 100644
--- a/examples/blogpost/tests.py
+++ b/examples/blogpost/tests.py
@@ -3,11 +3,13 @@
 
 from django.test import TestCase
 from django.core.urlresolvers import reverse
+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,7 @@ 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. 
-- 
cgit v1.2.3