          self.patched_settings = self.settings(STATIC_ROOT=temp_dir)
          self.patched_settings.enable()
          self.run_collectstatic()
          # Same comment as in runtests.teardown.
          self.addCleanup(shutil.rmtree, six.text_type(temp_dir))
  
      def tearDown(self):
          self.patched_settings.disable()
          super(CollectionTestCase, self).tearDown()
  
 
</s> remove         self.addCleanup(shutil.rmtree, six.text_type(temp_dir))
 </s> add         self.addCleanup(shutil.rmtree, temp_dir) </s> remove         shutil.rmtree(six.text_type(settings.STATIC_ROOT))
 </s> add         shutil.rmtree(settings.STATIC_ROOT) </s> remove         self.assertIs(type(a.misc_data), six.text_type)
 </s> add  </s> remove         elif isinstance(x, six.integer_types + (float,)) and isinstance(y, six.integer_types + (float,)):
 </s> add         elif isinstance(x, (float, int)) and isinstance(y, (float, int)): </s> remove             if isinstance(z, six.integer_types + (float,)):
 </s> add             if isinstance(z, (float, int)):
        self.addCleanup(shutil.rmtree, temp_dir)
          self.patched_settings = self.settings(STATIC_ROOT=temp_dir)
          self.patched_settings.enable()
          self.run_collectstatic()
          # Same comment as in runtests.teardown.
        self.addCleanup(shutil.rmtree, temp_dir)
  
      def tearDown(self):
          self.patched_settings.disable()
          super(CollectionTestCase, self).tearDown()
  
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