          )
          # An empty choice field should return None for the display name.
          self.assertIs(a.get_status_display(), None)
  
          # Empty strings should be returned as Unicode
          a = Article.objects.get(pk=a.pk)
          self.assertEqual(a.misc_data, '')
          self.assertIs(type(a.misc_data), six.text_type)
  
      def test_long_textfield(self):
 
</s> remove         self.assertIs(type(a.misc_data), six.text_type)
 </s> add  </s> remove         if isinstance(value, six.text_type):
            return six.memoryview(b64decode(force_bytes(value)))
 </s> add         if isinstance(value, str):
            return memoryview(b64decode(force_bytes(value))) </s> remove         self.assertEqual(six.text_type(w), "Full-time")
 </s> add         self.assertEqual(str(w), "Full-time") </s> remove         self.assertIsInstance(normalized, six.text_type)
 </s> add  </s> remove     if isinstance(pattern, six.string_types):
 </s> add     if isinstance(pattern, str):
        # Empty strings should be returned as string
          )
          # An empty choice field should return None for the display name.
          self.assertIs(a.get_status_display(), None)
  
        # Empty strings should be returned as string
          a = Article.objects.get(pk=a.pk)
          self.assertEqual(a.misc_data, '')
          self.assertIs(type(a.misc_data), six.text_type)
  
      def test_long_textfield(self):
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/model_regress/tests.py