CFY-1431 removed dict/set comprehensions for 2.6 support