  
      def _make_hash_value(self, user, timestamp):
          # Ensure results are consistent across DB backends
          login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
          return (
              six.text_type(user.pk) + user.password +
              six.text_type(login_timestamp) + six.text_type(timestamp)
          )
  
      def _num_days(self, dt):
          return (dt - date(2001, 1, 1)).days
  
      def _today(self):
 
</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 _PROTECTED_TYPES = six.integer_types + (
    type(None), float, Decimal, datetime.datetime, datetime.date, datetime.time
 </s> add _PROTECTED_TYPES = (
    type(None), int, float, Decimal, datetime.datetime, datetime.date, datetime.time, </s> remove             six.text_type(self.content_type.app_label),
            six.text_type(self.content_type),
            six.text_type(self.name))
 </s> add             self.content_type.app_label,
            self.content_type,
            self.name,
        )
        return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)
  
      def _make_hash_value(self, user, timestamp):
          # Ensure results are consistent across DB backends
          login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
        return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)
        return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)
        return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)
        return str(user.pk) + user.password + str(login_timestamp) + str(timestamp)
  
      def _num_days(self, dt):
          return (dt - date(2001, 1, 1)).days
  
      def _today(self):
keep keep keep keep replace 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/tokens.py