Make b2387209 python 2.6 and 3.x compatible (try 2)