  from django.db.models.query_utils import PathInfo
  from django.utils import six
  from django.utils.datastructures import ImmutableList, OrderedSet
  from django.utils.deprecation import RemovedInDjango21Warning
  from django.utils.encoding import force_text, python_2_unicode_compatible
  from django.utils.functional import cached_property
  from django.utils.text import camel_case_to_spaces, format_lazy
  from django.utils.translation import override
  
  PROXY_PARENTS = object()
 
</s> remove from django.utils.encoding import force_text, python_2_unicode_compatible
 </s> add from django.utils.encoding import force_text </s> remove from django.utils.encoding import (
    force_bytes, force_text, python_2_unicode_compatible,
)
 </s> add from django.utils.encoding import force_bytes, force_text </s> remove from django.utils.encoding import python_2_unicode_compatible
 </s> add  </s> remove from django.utils.encoding import (
    force_str, force_text, python_2_unicode_compatible,
)
 </s> add from django.utils.encoding import force_str, force_text </s> remove from django.utils.encoding import python_2_unicode_compatible
 </s> add 
from django.utils.encoding import force_text
  from django.db.models.query_utils import PathInfo
  from django.utils import six
  from django.utils.datastructures import ImmutableList, OrderedSet
  from django.utils.deprecation import RemovedInDjango21Warning
from django.utils.encoding import force_text
  from django.utils.functional import cached_property
  from django.utils.text import camel_case_to_spaces, format_lazy
  from django.utils.translation import override
  
  PROXY_PARENTS = object()
keep keep keep keep replace keep keep keep keep keep
 Refs #23919 -- Removed python_2_unicode_compatible decorator usage 
django/db/models/options.py