I moved Python 2 changes in a new pull request