  
  from django.test import LiveServerTestCase, override_settings
  from django.utils._os import upath
  from django.utils.http import urlencode
  from django.utils.six import text_type
  from django.utils.six.moves.urllib.error import HTTPError
  from django.utils.six.moves.urllib.request import urlopen
  
  from .models import Person
  
 
</s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add  </s> remove from django.utils import six
 </s> add 
  
  from django.test import LiveServerTestCase, override_settings
  from django.utils._os import upath
  from django.utils.http import urlencode

  from django.utils.six.moves.urllib.error import HTTPError
  from django.utils.six.moves.urllib.request import urlopen
  
  from .models import Person
  
keep keep keep keep replace keep keep keep keep keep
 Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews. 
tests/servers/tests.py