Python2.6 compat

Change-Id: Ic460702e25028d1f3bb367b2dd5a9987a06f5806