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/authentication.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/djangorestframework/tests/authentication.py b/djangorestframework/tests/authentication.py
index af9c34ca..246ad4a0 100644
--- a/djangorestframework/tests/authentication.py
+++ b/djangorestframework/tests/authentication.py
@@ -1,16 +1,14 @@
 from django.conf.urls.defaults import patterns
-from django.test import TestCase
-from django.test import Client
+from django.test import Client, TestCase
+from django.utils import simplejson as json
+
 from djangorestframework.compat import RequestFactory
 from djangorestframework.resource import Resource
 from django.contrib.auth.models import User
 from django.contrib.auth import login
 
 import base64
-try:
-    import json
-except ImportError:
-    import simplejson as json
+
 
 class MockResource(Resource):
     allowed_methods = ('POST',)
-- 
cgit v1.2.3