[diff] deal with py3k string types [applied]