[py3k] Replace uses of 'unicode' and 'str' [applied]