diffout should be diff_out

Same for the rest of the local variables/constants, etc. Check http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Naming