From 7adb3f548b952feca4c46c2d620a1c57e34165e5 Mon Sep 17 00:00:00 2001
From: yanghuichan <yanghc@fiberhome.com>
Date: Thu, 20 Jul 2017 16:53:25 +0800
Subject: [PATCH] Replace dict.iteritems() with dict.items() in horizon

1.As mentioned in [1], we should avoid using dict.iteritems()
to achieve iterators. We can use dict.items instead, as it will
return iterators in PY3 as well. And dict.items/keys will more
readable.
2.In py2, the performance about list should be negligible,
see the link [2].
[1] https://wiki.openstack.org/wiki/Python3
[2] http://lists.openstack.org/pipermail/openstack-dev/2015-June/066391.htmls

Change-Id: Idba02079d76b529b344ae96cebb7d6161c0ecbc6
---
 horizon/templates/horizon/_sidebar.html                       | 2 +-
 horizon/templates/horizon/_subnav_list.html                   | 2 +-
 .../integration_tests/pages/project/compute/imagespage.py     | 4 ++--
 .../themes/material/templates/horizon/_sidebar.html           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/horizon/templates/horizon/_sidebar.html b/horizon/templates/horizon/_sidebar.html
index f350b2cc0b..abedd46d0c 100644
--- a/horizon/templates/horizon/_sidebar.html
+++ b/horizon/templates/horizon/_sidebar.html
@@ -16,7 +16,7 @@
         </a>
         <ul id="sidebar-accordion-{{ dashboard.slug }}"
             class="nav collapse panel-collapse{% if current.slug == dashboard.slug %} in{% endif %}">
-          {% for group, panels in panel_info.iteritems %}
+          {% for group, panels in panel_info.items %}
             {% with panels|has_permissions_on_list:user as filtered_panels %}
               {% if filtered_panels %}
                 {% if group.name %}
diff --git a/horizon/templates/horizon/_subnav_list.html b/horizon/templates/horizon/_subnav_list.html
index 955ec0d288..c4d8001503 100644
--- a/horizon/templates/horizon/_subnav_list.html
+++ b/horizon/templates/horizon/_subnav_list.html
@@ -1,6 +1,6 @@
 {% load horizon %}
 
-{% for heading, panels in components.iteritems %}
+{% for heading, panels in components.items %}
   {% with panels|has_permissions_on_list:user as filtered_panels %}
     {% if filtered_panels %}
       {% if accessible_panels %}
diff --git a/openstack_dashboard/test/integration_tests/pages/project/compute/imagespage.py b/openstack_dashboard/test/integration_tests/pages/project/compute/imagespage.py
index 88448ba715..bad00414be 100644
--- a/openstack_dashboard/test/integration_tests/pages/project/compute/imagespage.py
+++ b/openstack_dashboard/test/integration_tests/pages/project/compute/imagespage.py
@@ -158,7 +158,7 @@ class ImagesPage(basepage.BaseNavigationPage):
     def add_custom_metadata(self, name, metadata):
         row = self._get_row_with_image_name(name)
         update_metadata_form = self.images_table.update_metadata(row)
-        for field_name, value in metadata.iteritems():
+        for field_name, value in metadata.items():
             update_metadata_form.add_custom_field(field_name, value)
         update_metadata_form.submit()
 
@@ -168,7 +168,7 @@ class ImagesPage(basepage.BaseNavigationPage):
         description_page = self.images_table.go_to_image_description_page(row)
         content = description_page.get_content()
 
-        for name, value in content.iteritems():
+        for name, value in content.items():
             if name in dict_with_details:
                 if dict_with_details[name] in value:
                     matches.append(True)
diff --git a/openstack_dashboard/themes/material/templates/horizon/_sidebar.html b/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
index bdae66d468..9d7163d466 100644
--- a/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
+++ b/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
@@ -17,7 +17,7 @@
           </a>
           <ul id="sidebar-drawer-{{ dashboard.slug }}"
               class="nav collapse panel-collapse{% if current.slug == dashboard.slug %} in{% endif %}">
-            {% for group, panels in panel_info.iteritems %}
+            {% for group, panels in panel_info.items %}
               {% with panels|has_permissions_on_list:user as filtered_panels %}
                 {% if filtered_panels %}
                   {% if group.name %}