Fix Py3 flake8 errors