                      'codename')
  
      def __str__(self):
          return "%s | %s | %s" % (
              six.text_type(self.content_type.app_label),
              six.text_type(self.content_type),
              six.text_type(self.name))
  
      def natural_key(self):
          return (self.codename,) + self.content_type.natural_key()
      natural_key.dependencies = ['contenttypes.contenttype']
  
 
</s> remove         return "%s (%s)" % (self.revision, six.text_type(self.repository))
 </s> add         return "%s (%s)" % (self.revision, str(self.repository)) </s> remove         ', '.join(six.text_type(arg) for arg in [one, two] + list(args)),
 </s> add         ', '.join(str(arg) for arg in [one, two] + list(args)), </s> remove         ', '.join(six.text_type(arg) for arg in [one, two] + list(args)),
 </s> add         ', '.join(str(arg) for arg in [one, two] + list(args)), </s> remove         ', '.join(six.text_type(arg) for arg in [one, two] + list(args))
 </s> add         ', '.join(str(arg) for arg in [one, two] + list(args)) </s> remove                 ', '.join(six.text_type(arg) for arg in [one, two] + list(args))
 </s> add                 ', '.join(str(arg) for arg in [one, two] + list(args))
            self.content_type.app_label,
            self.content_type,
            self.name,
        )
                      'codename')
  
      def __str__(self):
          return "%s | %s | %s" % (
            self.content_type.app_label,
            self.content_type,
            self.name,
        )
            self.content_type.app_label,
            self.content_type,
            self.name,
        )
            self.content_type.app_label,
            self.content_type,
            self.name,
        )
  
      def natural_key(self):
          return (self.codename,) + self.content_type.natural_key()
      natural_key.dependencies = ['contenttypes.contenttype']
  
keep keep keep keep replace replace replace keep keep keep keep keep
 Refs #23919 -- Removed six.<various>_types usage

Thanks Tim Graham and Simon Charette for the reviews. 
django/contrib/auth/models.py