Fix for python 2.6

My totally wicked sweet dictionary comprehension is not allowed
in 2.6.