Redo py3k branching from trunk again