Redo py3k branching from trunk again

[SVN r52115]