python2.5 compatibility
pep8 for contrib