PEP8 cleanups in the pypump module

I've ignored long lines (most are < 100) as I don't want to do too much refactoring