Replace basestring
by six.string_types
#655
Merged
basestring
by six.string_types
#655