HH-37492 make python2.6 compatible