I've rebased the python3 branch over master and pushed it to python3-rebased so that I don't force push over other people's work. This merge request proposes changes to the python3-rebased branch so that it can then be pushed to master. These should be the last changes that allow the tests to run under python3. Test with python3.9.0.