  class BigInt(models.Model):
      biggie = models.BigIntegerField()
  
      def __str__(self):
          return six.text_type(self.biggie)
  
  
  class MarkupField(models.CharField):
      def __init__(self, *args, **kwargs):
          kwargs["max_length"] = 20
 
</s> remove from django.utils import six
 </s> add  </s> remove         return six.text_type(self.text)
 </s> add         return self.text </s> remove         return six.text_type(self.name)
 </s> add         return self.name </s> remove         return six.text_type(self.name)
 </s> add         return self.name </s> remove         self.assertEqual(floatformat(nan), six.text_type(nan))
 </s> add         self.assertEqual(floatformat(nan), str(nan))
        return str(self.biggie)
  class BigInt(models.Model):
      biggie = models.BigIntegerField()
  
      def __str__(self):
        return str(self.biggie)
  
  
  class MarkupField(models.CharField):
      def __init__(self, *args, **kwargs):
          kwargs["max_length"] = 20
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_forms/models.py