              force_text(MyString())
  
      def test_force_text_lazy(self):
          s = SimpleLazyObject(lambda: 'x')
          self.assertTrue(issubclass(type(force_text(s)), six.text_type))
  
      def test_force_bytes_exception(self):
          """
          force_bytes knows how to convert to bytes an exception
          containing non-ASCII characters in its args.
 
</s> remove             return six.text_type(s).encode(encoding)
 </s> add             return str(s).encode(encoding) </s> remove         if isinstance(file, six.string_types) or file is None:
 </s> add         if isinstance(file, str) or file is None: </s> remove 

def to_unicode(s):
    """
    Convert strings to Unicode objects (and return all other data types
    unchanged).
    """
    if isinstance(s, six.string_types):
        return force_text(s)
    return s
 </s> add  </s> remove         self.assertIsInstance(normalized, six.text_type)
 </s> add  </s> remove # Removing the temporary TMPDIR. Ensure we pass in unicode so that it will
# successfully remove temp trees containing non-ASCII filenames on Windows.
# (We're assuming the temp dir name itself only contains ASCII characters.)
atexit.register(shutil.rmtree, six.text_type(TMPDIR))
 </s> add # Removing the temporary TMPDIR.
atexit.register(shutil.rmtree, TMPDIR)
        self.assertTrue(issubclass(type(force_text(s)), str))
              force_text(MyString())
  
      def test_force_text_lazy(self):
          s = SimpleLazyObject(lambda: 'x')
        self.assertTrue(issubclass(type(force_text(s)), str))
  
      def test_force_bytes_exception(self):
          """
          force_bytes knows how to convert to bytes an exception
          containing non-ASCII characters in its args.
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/utils_tests/test_encoding.py