      value = models.CharField(max_length=20)
      another_value = models.CharField(max_length=20, blank=True)
  
      def __str__(self):
          return six.text_type(self.name)
  
  
  class RelatedPoint(models.Model):
      name = models.CharField(max_length=20)
      data = models.ForeignKey(DataPoint, models.CASCADE)
 
</s> remove         return six.text_type(self.name)
 </s> add         return self.name </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.biggie)
 </s> add         return str(self.biggie) </s> remove         return six.text_type(self.num)
 </s> add         return str(self.num)
        return self.name
      value = models.CharField(max_length=20)
      another_value = models.CharField(max_length=20, blank=True)
  
      def __str__(self):
        return self.name
  
  
  class RelatedPoint(models.Model):
      name = models.CharField(max_length=20)
      data = models.ForeignKey(DataPoint, models.CASCADE)
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/update/models.py