From 2fb98a6b829df9d16cfe132b1bd4eca7013ed2fa Mon Sep 17 00:00:00 2001
From: Lu lei <lei.lu@easystack.cn>
Date: Tue, 23 Aug 2016 11:08:25 +0800
Subject: [PATCH] py3:Remove six.iterXXX
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、As mentioned in [1], we should avoid using six.iteritems/keys
   achieve iterators. We can use dict.items/keys 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.html

TrivialFix.

Change-Id: I0cbe8af3210233a58d25f0df187c3d085405aa2a
---
 kolla/image/build.py | 2 +-
 tests/test_build.py  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kolla/image/build.py b/kolla/image/build.py
index 0a2103516a..990ca5265c 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -861,7 +861,7 @@ class KollaWorker(object):
             return
 
         def list_children(images, ancestry):
-            children = six.next(six.itervalues(ancestry))
+            children = six.next(ancestry.values())
             for image in images:
                 if image.status not in [STATUS_MATCHED]:
                     continue
diff --git a/tests/test_build.py b/tests/test_build.py
index d0ea83813f..985b124aa4 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -18,7 +18,6 @@ from mock import patch
 from oslo_log import fixture as log_fixture
 from oslo_log import log as logging
 from oslotest import base
-import six
 import testtools
 
 sys.path.append(
@@ -28,7 +27,6 @@ from kolla.image import build
 LOG = logging.getLogger(__name__)
 
 
-@six.add_metaclass(abc.ABCMeta)
 class BuildTest(object):
     excluded_images = abc.abstractproperty()
 
@@ -46,7 +44,7 @@ class BuildTest(object):
             bad_results, good_results, unmatched_results = build.run_build()
 
         failures = 0
-        for image, result in six.iteritems(bad_results):
+        for image, result in bad_results.items():
             if image in self.excluded_images:
                 if result is 'error':
                     continue
-- 
GitLab