  from django.conf import settings
  from django.utils import six
  
  
  # Handle django.utils.encoding rename in 1.5 onwards.
  # smart_unicode -> smart_text
  # force_unicode -> force_text
 
</s> remove import django
import inspect
 </s> add  </s> remove from django.utils import timezone
 </s> add from django.utils import six, timezone </s> remove from django.utils import timezone
 </s> add  </s> remove             self.choice_strings_to_values[str(item)] for item in value
 </s> add             self.choice_strings_to_values[six.text_type(item)] for item in value
import django
import inspect
  from django.conf import settings
  from django.utils import six
import django
import inspect
  
  
  # Handle django.utils.encoding rename in 1.5 onwards.
  # smart_unicode -> smart_text
  # force_unicode -> force_text
keep add keep keep keep keep keep
 Use six.text_type instead of str everywhere 
rest_framework/compat.py