Merge "Define unicode as str if using Python 3"