  from django.conf import settings
  from django.core.management import call_command
  from django.template import Context, Template
  from django.test import SimpleTestCase, override_settings
  from django.utils import six
  from django.utils.encoding import force_text
  
  from .settings import TEST_SETTINGS
  
  
 
</s> remove from django.utils import html, six, text
 </s> add from django.utils import html, text </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, timezone
 </s> add from django.utils import timezone </s> remove from django.utils import six, timezone
 </s> add from django.utils import timezone
  from django.conf import settings
  from django.core.management import call_command
  from django.template import Context, Template
  from django.test import SimpleTestCase, override_settings

  from django.utils.encoding import force_text
  
  from .settings import TEST_SETTINGS
  
  
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/staticfiles_tests/cases.py