Convert list/dict comprehensions for use on CentOS's version of Python

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>