The py3k branch is the new trunk.