Remove Python 2 basestring compatibility tricks
#1220
Merged
basestring compatibility tricks
#1220