  
  import django
  from django.conf import settings
  from django.test import testcases
  from django.utils.http import urlencode
  from django.test.client import ClientHandler, Client as DjangoClient
  
 
</s> remove from django.utils import six
 </s> add  </s> remove from django.test.client import Client as DjangoClient
from django.test.client import ClientHandler
 </s> add  </s> remove from rest_framework.compat import RequestFactory as DjangoRequestFactory
from rest_framework.compat import force_bytes_or_smart_bytes
 </s> add from rest_framework.compat import (
    force_bytes_or_smart_bytes, RequestFactory as DjangoRequestFactory
) </s> remove from django.core.exceptions import ImproperlyConfigured
 </s> add from django.utils import six
from django.utils import six
  
  import django
from django.utils import six
  from django.conf import settings
  from django.test import testcases
  from django.utils.http import urlencode
  from django.test.client import ClientHandler, Client as DjangoClient
  
keep add keep keep keep keep keep
 Cleanup import following PEP 8 style guide 
rest_framework/test.py