Fix some PEP8 errors
Revert "Fix some PEP8 errors"

This reverts commit 45ef6a2dcf10a3cecdf33f2aa2d6a4afb5c851a1.
Fix some PEP8 errors
fix some pep8 errors
Fix some pep8 errors
fix merge conflicts
fix merge conflicts
Merge branch 'PEP8fix' of https://github.com/muraty/tweepy into PEP8fix