  
          self.patched_settings = self.settings(
              STATICFILES_DIRS=settings.STATICFILES_DIRS + [temp_dir])
          self.patched_settings.enable()
          self.addCleanup(shutil.rmtree, six.text_type(temp_dir))
          self._manifest_strict = storage.staticfiles_storage.manifest_strict
  
      def tearDown(self):
          self.patched_settings.disable()
  
 
</s> remove         self.addCleanup(shutil.rmtree, six.text_type(temp_dir))
 </s> add         self.addCleanup(shutil.rmtree, temp_dir) </s> remove         add_header = lazy(lambda string: 'Header\n\n' + string, six.text_type)
 </s> add         add_header = lazy(lambda string: 'Header\n\n' + string, str) </s> remove         add_html = lazy(lambda string: string + 'special characters > here', six.text_type)
 </s> add         add_html = lazy(lambda string: string + 'special characters > here', str) </s> remove         append_script = lazy(lambda string: r'<script>this</script>' + string, six.text_type)
 </s> add         append_script = lazy(lambda string: r'<script>this</script>' + string, str) </s> remove         prepend_www = lazy(lambda url: 'www.' + url, six.text_type)
 </s> add         prepend_www = lazy(lambda url: 'www.' + url, str)
        self.addCleanup(shutil.rmtree, temp_dir)
  
          self.patched_settings = self.settings(
              STATICFILES_DIRS=settings.STATICFILES_DIRS + [temp_dir])
          self.patched_settings.enable()
        self.addCleanup(shutil.rmtree, temp_dir)
          self._manifest_strict = storage.staticfiles_storage.manifest_strict
  
      def tearDown(self):
          self.patched_settings.disable()
  
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/test_storage.py