  from django.conf import settings
  from django.core import validators
  from django.core.exceptions import ValidationError
  from django.utils import timezone
  from django.utils.dateparse import parse_date, parse_datetime, parse_time
  from django.utils.encoding import is_protected_type
  from django.utils.translation import ugettext_lazy as _
  from rest_framework import ISO_8601
 
</s> remove                             {'display_name': 'red', 'value': 'red'}
 </s> add                             {'display_name': 'blue', 'value': 'blue'} </s> remove             "serializer '%s', as it is the same the field name. "
 </s> add             "serializer '%s', because it is the same as the field name. "
from django.utils.datastructures import SortedDict
  from django.conf import settings
  from django.core import validators
  from django.core.exceptions import ValidationError
  from django.utils import timezone
from django.utils.datastructures import SortedDict
  from django.utils.dateparse import parse_date, parse_datetime, parse_time
  from django.utils.encoding import is_protected_type
  from django.utils.translation import ugettext_lazy as _
  from rest_framework import ISO_8601
keep keep keep add keep keep keep keep
 Ensure proper sorting of 'choices' attribute on ChoiceField 
rest_framework/fields.py