Fix pylint disable pragmas that were pep8 violations

@andy-armstrong