FIX avoid dict comprehension for Py2.6