Merge "py3: Replace dict.iteritems() with dict.items()"

This commit is contained in:
Jenkins 2015-12-22 11:15:40 +00:00 committed by Gerrit Code Review
commit 171f54bfe7

View File

@ -352,8 +352,8 @@ class TabbedFormRegion(FormRegion):
self.switch_to_tab(self.tab_index)
fields = self.get_fields()
if isinstance(fields, dict):
return dict([(key, field) for (key, field)
in fields.iteritems() if field.is_displayed()])
return {key: field for (key, field)
in six.iteritems(fields) if field.is_displayed()}
else:
return [field for field in fields if field.is_displayed()]