Dictionary comprehensions not supported on <2.6. Had to revert to manual code...