replace dict comprehension with dict constructor

this should make it compatible with python2.6

Change-Id: I0f1ba0efb6f3ff47243118a2f8a7cdc7c7e72bfe
Closes-Bug: #1287631
Merge "replace dict comprehension with dict constructor"