py2.6 compatibility

Change-Id: I0e882b3292e499f8cfb1b22b683da09604704e1c