Ah, that's some conflicting information between your pep8 quote and my pep8 output.
Going for the top option as it satisfies both.