  REST framework settings, checking for user settings first, then falling
  back to the defaults.
  """
  from __future__ import unicode_literals
  from django.test.signals import setting_changed
  from django.conf import settings
  from django.utils import six
  from rest_framework import ISO_8601
  from rest_framework.compat import importlib
  
  USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
 
</s> remove from django.test.client import Client as DjangoClient
from django.test.client import ClientHandler
 </s> add  </s> remove from django.utils import six
import django
import inspect
 </s> add  </s> remove from django.utils import six
 </s> add 
  REST framework settings, checking for user settings first, then falling
  back to the defaults.
  """
  from __future__ import unicode_literals


  from django.utils import six
  from rest_framework import ISO_8601
  from rest_framework.compat import importlib
  
  USER_SETTINGS = getattr(settings, 'REST_FRAMEWORK', None)
keep keep keep keep replace replace keep keep keep keep keep
 Cleanup import following PEP 8 style guide 
rest_framework/settings.py