openstack/ironic
Code Issues Proposed changes

Merge "Replace six iteration methods with standard ones"

Browse Source
This commit is contained in:
Jenkins 2016-09-12 15:55:06 +00:00 committed by Gerrit Code Review
commit 705e96c92e
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/common/glance_service/v2/image_service.py
View File

@ -17,7 +17,6 @@ import collections
import time
from oslo_utils import uuidutils
import six
from six.moves.urllib import parse as urlparse
from swiftclient import utils as swift_utils
@ -260,7 +259,7 @@ class GlanceImageService(base_image_service.BaseImageService,
int(time.time()) +
CONF.glance.swift_temp_url_expected_download_start_delay)
keys_to_remove = [
k for k, v in six.iteritems(self._cache)
k for k, v in self._cache.items()
if (v.url_expires_at < max_valid_time)]
for k in keys_to_remove:
del self._cache[k]

3
ironic_tempest_plugin/services/baremetal/base.py
View File

@ -13,7 +13,6 @@
import functools
from oslo_serialization import jsonutils as json
import six
from six.moves.urllib import parse as urllib
from tempest.lib.common import api_version_utils
from tempest.lib.common import rest_client
@ -98,7 +97,7 @@ class BaremetalClient(rest_client.RestClient):
"""
def get_change(kwargs, path='/'):
for name, value in six.iteritems(kwargs):
for name, value in kwargs.items():
if isinstance(value, dict):
for ch in get_change(value, path + '%s/' % name):
yield ch

3
ironic_tempest_plugin/tests/api/admin/test_chassis.py
View File

@ -11,7 +11,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -29,7 +28,7 @@ class TestChassis(base.BaseBaremetalTest):
def _assertExpected(self, expected, actual):
# Check if not expected keys/values exists in actual response body
for key, value in six.iteritems(expected):
for key, value in expected.items():
if key not in ('created_at', 'updated_at'):
self.assertIn(key, actual)
self.assertEqual(value, actual[key])

2
ironic_tempest_plugin/tests/api/admin/test_nodes.py
View File

@ -30,7 +30,7 @@ class TestNodes(base.BaseBaremetalTest):
def _assertExpected(self, expected, actual):
# Check if not expected keys/values exists in actual response body
for key, value in six.iteritems(expected):
for key, value in expected.items():
if key not in ('created_at', 'updated_at'):
self.assertIn(key, actual)
self.assertEqual(value, actual[key])

3
ironic_tempest_plugin/tests/api/admin/test_ports.py
View File

@ -10,7 +10,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
from tempest.lib.common.utils import data_utils
from tempest.lib import exceptions as lib_exc
from tempest import test
@ -31,7 +30,7 @@ class TestPorts(base.BaseBaremetalTest):
def _assertExpected(self, expected, actual):
# Check if not expected keys/values exists in actual response body
for key, value in six.iteritems(expected):
for key, value in expected.items():
if key not in ('created_at', 'updated_at'):
self.assertIn(key, actual)
self.assertEqual(value, actual[key])