Fix str() to six.text_type() and long() to int()