Clean up some whitespace, test python version the same (cleaner) way that trunk does
Authored by: kylev 2010-02-25
Parent: [r640]
Child: [r642]
