Rebase for py3 splits the python-modernize and the py3 patches in two commits