              # and sets self.timezone = get_default_timezone().
              pass
          if name is None:
              name = self.format('O')
          return six.text_type(name)
  
      def u(self):
          "Microseconds; i.e. '000000' to '999999'"
          return '%06d' % self.data.microsecond
  
 
</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             if isinstance(ogr_type, six.integer_types) and ogr_type > 1000:
 </s> add             if isinstance(ogr_type, int) and ogr_type > 1000: </s> remove         return six.text_type(self.num)
 </s> add         return str(self.num) </s> remove         return six.text_type(value)
 </s> add         return str(value)
        return str(name)
              # and sets self.timezone = get_default_timezone().
              pass
          if name is None:
              name = self.format('O')
        return str(name)
  
      def u(self):
          "Microseconds; i.e. '000000' to '999999'"
          return '%06d' % self.data.microsecond
  
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. 
django/utils/dateformat.py