aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/authentication.py
diff options
context:
space:
mode:
authorTom Christie2012-12-19 23:12:27 +0000
committerTom Christie2012-12-19 23:12:27 +0000
commita493c83248535c9fa7f78815b16bce7e88bf7966 (patch)
treeb52e34b8b6ecfcc08f0135bc0a503b939e53a3ec /rest_framework/tests/authentication.py
parentc097bcef586da4513d1d6f357d9eb3d7b4b0fffb (diff)
downloaddjango-rest-framework-a493c83248535c9fa7f78815b16bce7e88bf7966.tar.bz2
urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability
Diffstat (limited to 'rest_framework/tests/authentication.py')
-rw-r--r--rest_framework/tests/authentication.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/rest_framework/tests/authentication.py b/rest_framework/tests/authentication.py
index d498ae3e..838e081b 100644
--- a/rest_framework/tests/authentication.py
+++ b/rest_framework/tests/authentication.py
@@ -1,15 +1,13 @@
-from django.conf.urls.defaults import patterns
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 django.http import HttpResponse
-from rest_framework.views import APIView
from rest_framework import permissions
-
from rest_framework.authtoken.models import Token
from rest_framework.authentication import TokenAuthentication
+from rest_framework.compat import patterns
+from rest_framework.views import APIView
import base64