Python 2.6 compatibility

Replace dict comprehension by Python 2.6 compatible expression.