BUG: Remove dict comprehension to support Python 2.6