PEP8-ization

git-svn-id: https://jbrout.googlecode.com/svn/trunk@354 b4d1b9c4-0e25-0410-a282-091a75307ab2
Except not else

git-svn-id: https://jbrout.googlecode.com/svn/trunk@355 b4d1b9c4-0e25-0410-a282-091a75307ab2