pep8 fixes for setup.py

as reported by flake8
Merge remote-tracking branch 'esc/pep8/setup.py'