aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/authentication.py
diff options
context:
space:
mode:
authorYuri Prezument2013-01-05 07:57:42 -0800
committerYuri Prezument2013-01-05 07:57:42 -0800
commite65f4071644c02bef9bc0cd6ad78b0441f647770 (patch)
tree8e1641d0699518bf212a4741c400f93359b27ba0 /rest_framework/tests/authentication.py
parent8a4e2c172570933fb6da86dc9eae69027ffb6f33 (diff)
parenta061e3d9e20c4c481c2ac2eee5b17bb1430cace6 (diff)
downloaddjango-rest-framework-e65f4071644c02bef9bc0cd6ad78b0441f647770.tar.bz2
Merge pull request #554 from juanriaza/master
Deprecate django.utils.simplejson in favor of Python 2.6's built-in json module
Diffstat (limited to 'rest_framework/tests/authentication.py')
-rw-r--r--rest_framework/tests/authentication.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/authentication.py b/rest_framework/tests/authentication.py
index 838e081b..e86041bc 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