PEP8 : making pep8 happy again

 - trivial line break
 - work-around for bug in pep8
   https://github.com/jcrocholl/pep8/issues/271
Merge pull request #2960 from tacaswell/minor_pep8

PEP8 : making pep8 happy again