openstack/kolla-ansible
Code Issues Proposed changes

Merge "py3:Remove six.iterXXX"

Browse Source
This commit is contained in:
Jenkins 2016-08-23 10:12:06 +00:00 committed by Gerrit Code Review
commit 4d1b3e2471
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kolla/image/build.py
View File

@ -861,7 +861,7 @@ class KollaWorker(object):
return return
def list_children(images, ancestry): def list_children(images, ancestry):
children = six.next(six.itervalues(ancestry)) children = six.next(ancestry.values())
for image in images: for image in images:
if image.status not in [STATUS_MATCHED]: if image.status not in [STATUS_MATCHED]:
continue continue

4
tests/test_build.py
View File

@ -18,7 +18,6 @@ from mock import patch
from oslo_log import fixture as log_fixture from oslo_log import fixture as log_fixture
from oslo_log import log as logging from oslo_log import log as logging
from oslotest import base from oslotest import base
import six
import testtools import testtools
sys.path.append( sys.path.append(
@ -28,7 +27,6 @@ from kolla.image import build
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta)
class BuildTest(object): class BuildTest(object):
excluded_images = abc.abstractproperty() excluded_images = abc.abstractproperty()
@ -46,7 +44,7 @@ class BuildTest(object):
bad_results, good_results, unmatched_results = build.run_build() bad_results, good_results, unmatched_results = build.run_build()
failures = 0 failures = 0
for image, result in six.iteritems(bad_results): for image, result in bad_results.items():
if image in self.excluded_images: if image in self.excluded_images:
if result is 'error': if result is 'error':
continue continue