py2.6 support changes