PEP8: Fix errors in latest changes
Merge branch 'pr/2617' into master.

Reviewed at https://github.com/scipy/scipy/pull/2617