diff options
| author | Tom Christie | 2014-08-19 17:06:55 +0100 | 
|---|---|---|
| committer | Tom Christie | 2014-08-19 17:06:55 +0100 | 
| commit | 63d02dbea855a060ec4cdb194497188e2f40cb66 (patch) | |
| tree | 6b928af2fb99cabf486bc15079db3cd831d8bf34 /rest_framework/test.py | |
| parent | 00c0dfc66fd2426a63e6eec498395740b2c3e63b (diff) | |
| download | django-rest-framework-63d02dbea855a060ec4cdb194497188e2f40cb66.tar.bz2 | |
Drop six from compat. 1.4.2 is now the lowest supported version.
Diffstat (limited to 'rest_framework/test.py')
| -rw-r--r-- | rest_framework/test.py | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/rest_framework/test.py b/rest_framework/test.py index 9242cf7c..f89a6dcd 100644 --- a/rest_framework/test.py +++ b/rest_framework/test.py @@ -8,10 +8,11 @@ from django.conf import settings  from django.test.client import Client as DjangoClient  from django.test.client import ClientHandler  from django.test import testcases +from django.utils import six  from django.utils.http import urlencode  from rest_framework.settings import api_settings  from rest_framework.compat import RequestFactory as DjangoRequestFactory -from rest_framework.compat import force_bytes_or_smart_bytes, six +from rest_framework.compat import force_bytes_or_smart_bytes  def force_authenticate(request, user=None, token=None): | 
