From a061e3d9e20c4c481c2ac2eee5b17bb1430cace6 Mon Sep 17 00:00:00 2001
From: Juan Riaza <juanriaza@gmail.com>
Date: Sat, 5 Jan 2013 13:40:02 +0100
Subject: [PATCH] deprecate simplejson

---
 rest_framework/parsers.py                      | 2 +-
 rest_framework/renderers.py                    | 2 +-
 rest_framework/tests/authentication.py         | 2 +-
 rest_framework/tests/generics.py               | 2 +-
 rest_framework/tests/hyperlinkedserializers.py | 2 +-
 rest_framework/tests/request.py                | 2 +-
 rest_framework/utils/encoders.py               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 4841676c9..149d64311 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -8,11 +8,11 @@ on the request, such as form content or json encoded data.
 from django.http import QueryDict
 from django.http.multipartparser import MultiPartParser as DjangoMultiPartParser
 from django.http.multipartparser import MultiPartParserError
-from django.utils import simplejson as json
 from rest_framework.compat import yaml, ETParseError
 from rest_framework.exceptions import ParseError
 from xml.etree import ElementTree as ET
 from xml.parsers.expat import ExpatError
+import json
 import datetime
 import decimal
 
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a4ae717db..0a34abaa0 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -8,10 +8,10 @@ REST framework also provides an HTML renderer the renders the browsable API.
 """
 import copy
 import string
+import json
 from django import forms
 from django.http.multipartparser import parse_header
 from django.template import RequestContext, loader, Template
-from django.utils import simplejson as json
 from rest_framework.compat import yaml
 from rest_framework.exceptions import ConfigurationError
 from rest_framework.settings import api_settings
diff --git a/rest_framework/tests/authentication.py b/rest_framework/tests/authentication.py
index 838e081bb..e86041bc4 100644
--- a/rest_framework/tests/authentication.py
+++ b/rest_framework/tests/authentication.py
@@ -1,7 +1,6 @@
 from django.contrib.auth.models import User
 from django.http import HttpResponse
 from django.test import Client, TestCase
-from django.utils import simplejson as json
 
 from rest_framework import permissions
 from rest_framework.authtoken.models import Token
@@ -9,6 +8,7 @@ from rest_framework.authentication import TokenAuthentication
 from rest_framework.compat import patterns
 from rest_framework.views import APIView
 
+import json
 import base64
 
 
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py
index 843017ebf..4799a04b5 100644
--- a/rest_framework/tests/generics.py
+++ b/rest_framework/tests/generics.py
@@ -1,6 +1,6 @@
+import json
 from django.db import models
 from django.test import TestCase
-from django.utils import simplejson as json
 from rest_framework import generics, serializers, status
 from rest_framework.tests.utils import RequestFactory
 from rest_framework.tests.models import BasicModel, Comment, SlugBasedModel
diff --git a/rest_framework/tests/hyperlinkedserializers.py b/rest_framework/tests/hyperlinkedserializers.py
index ee4d8e577..c6a8224b1 100644
--- a/rest_framework/tests/hyperlinkedserializers.py
+++ b/rest_framework/tests/hyperlinkedserializers.py
@@ -1,6 +1,6 @@
+import json
 from django.test import TestCase
 from django.test.client import RequestFactory
-from django.utils import simplejson as json
 from rest_framework import generics, status, serializers
 from rest_framework.compat import patterns, url
 from rest_framework.tests.models import Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, Album, Photo, OptionalRelationModel
diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py
index 1f05ff8ff..4b0324056 100644
--- a/rest_framework/tests/request.py
+++ b/rest_framework/tests/request.py
@@ -1,12 +1,12 @@
 """
 Tests for content parsing, and form-overloaded content parsing.
 """
+import json
 from django.contrib.auth.models import User
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TestCase, Client
 from django.test.client import RequestFactory
-from django.utils import simplejson as json
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.compat import patterns
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
index 2d1fb353e..c70b24dda 100644
--- a/rest_framework/utils/encoders.py
+++ b/rest_framework/utils/encoders.py
@@ -4,7 +4,7 @@ Helper classes for parsers.
 import datetime
 import decimal
 import types
-from django.utils import simplejson as json
+import json
 from django.utils.datastructures import SortedDict
 from rest_framework.compat import timezone
 from rest_framework.serializers import DictWithMetadata, SortedDictWithMetadata