  from threading import local
  
  from django.utils import six
  from django.utils.encoding import force_text, iri_to_uri
  from django.utils.functional import lazy
  from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
  from django.utils.translation import override
  
 
</s> remove from django.utils import six
 </s> add  </s> remove from django.utils import dateformat, datetime_safe, numberformat, six
 </s> add from django.utils import dateformat, datetime_safe, numberformat </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils.six import string_types, text_type
 </s> add 
  from threading import local
  

  from django.utils.encoding import force_text, iri_to_uri
  from django.utils.functional import lazy
  from django.utils.six.moves.urllib.parse import urlsplit, urlunsplit
  from django.utils.translation import override
  
keep keep replace keep keep keep keep keep
 Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews. 
django/urls/base.py