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)

---
 djangorestframework/tests/reverse.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'djangorestframework/tests/reverse.py')

diff --git a/djangorestframework/tests/reverse.py b/djangorestframework/tests/reverse.py
index a862e39a..2718ebca 100644
--- a/djangorestframework/tests/reverse.py
+++ b/djangorestframework/tests/reverse.py
@@ -1,14 +1,10 @@
 from django.conf.urls.defaults import patterns, url
 from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.utils import simplejson as json
 
 from djangorestframework.resource import Resource
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 
 class MockResource(Resource):
     """Mock resource which simply returns a URL, so that we can ensure that reversed URLs are fully qualified"""
-- 
cgit v1.2.3