Port 60893 to py3k, without unicode test.
1 file changed