Fix python2.5 syntax errors.