Previous commit wasn't fully vetted for PEP8 compliance and for the most part was unnecessary (vimdiff was showing more context changes and I was a bit hasty with the commit hammer).
Requested-by: zippybr
Authored by: yaberauneya 2012-02-10
Parent: [r10086]
Child: [r10088]
