Fix str() to six.text_type()