openstack/ironic
Code Issues Proposed changes

Remove unnecessary calls to dict.keys()

Browse Source 
It is preferred not to use the keys method when not needed because
the keys() method of dict objects behaves differently
under Python 2 and Python 3
and in most cases using keys is inefficient.

Change-Id: Iee5b2822933ec1b91e847e47c71682cadc26967f
This commit is contained in:
Edan David
2016-06-27 08:55:01 -04:00
parent a6e19588b8
commit f5e6e79e45
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/iscsi_deploy.py
View File

@@ -272,7 +272,7 @@ def continue_deploy(task, **kwargs):
if LOG.isEnabledFor(logging.logging.DEBUG): if LOG.isEnabledFor(logging.logging.DEBUG):
log_params = { log_params = {
k: params[k] if k != 'configdrive' else '***' k: params[k] if k != 'configdrive' else '***'
for k in params.keys() for k in params
} }
LOG.debug('Continuing deployment for node %(node)s, params %(params)s', LOG.debug('Continuing deployment for node %(node)s, params %(params)s',
{'node': node.uuid, 'params': log_params}) {'node': node.uuid, 'params': log_params})

2
ironic/tests/base.py
View File

@@ -130,7 +130,7 @@ class TestCase(testtools.TestCase):
# Delete attributes that don't start with _ so they don't pin # Delete attributes that don't start with _ so they don't pin
# memory around unnecessarily for the duration of the test # memory around unnecessarily for the duration of the test
# suite # suite
for key in [k for k in self.__dict__.keys() if k[0] != '_']: for key in [k for k in self.__dict__ if k[0] != '_']:
del self.__dict__[key] del self.__dict__[key]
def config(self, **kw): def config(self, **kw):

2
ironic/tests/unit/api/test_root.py
View File

@@ -41,7 +41,7 @@ class TestV1Root(base.BaseApiTest):
data = self.get_json('/') data = self.get_json('/')
self.assertEqual('v1', data['id']) self.assertEqual('v1', data['id'])
# Check fields are not empty # Check fields are not empty
for f in data.keys(): for f in data:
self.assertNotIn(f, ['', []]) self.assertNotIn(f, ['', []])
# Check if all known resources are present and there are no extra ones. # Check if all known resources are present and there are no extra ones.
not_resources = ('id', 'links', 'media_types') not_resources = ('id', 'links', 'media_types')

8
ironic/tests/unit/api/v1/test_chassis.py
View File

@@ -137,7 +137,7 @@ class TestListChassis(test_api_base.BaseApiTest):
uuid = uuidutils.generate_uuid() uuid = uuidutils.generate_uuid()
obj_utils.create_test_chassis(self.context, uuid=uuid) obj_utils.create_test_chassis(self.context, uuid=uuid)
data = self.get_json('/chassis/%s' % uuid) data = self.get_json('/chassis/%s' % uuid)
self.assertIn('links', data.keys()) self.assertIn('links', data)
self.assertEqual(2, len(data['links'])) self.assertEqual(2, len(data['links']))
self.assertIn(uuid, data['links'][0]['href']) self.assertIn(uuid, data['links'][0]['href'])
for l in data['links']: for l in data['links']:
@@ -201,7 +201,7 @@ class TestListChassis(test_api_base.BaseApiTest):
def test_nodes_subresource_link(self): def test_nodes_subresource_link(self):
chassis = obj_utils.create_test_chassis(self.context) chassis = obj_utils.create_test_chassis(self.context)
data = self.get_json('/chassis/%s' % chassis.uuid) data = self.get_json('/chassis/%s' % chassis.uuid)
self.assertIn('nodes', data.keys()) self.assertIn('nodes', data)
def test_nodes_subresource(self): def test_nodes_subresource(self):
chassis = obj_utils.create_test_chassis(self.context) chassis = obj_utils.create_test_chassis(self.context)
@@ -213,12 +213,12 @@ class TestListChassis(test_api_base.BaseApiTest):
data = self.get_json('/chassis/%s/nodes' % chassis.uuid) data = self.get_json('/chassis/%s/nodes' % chassis.uuid)
self.assertEqual(2, len(data['nodes'])) self.assertEqual(2, len(data['nodes']))
self.assertNotIn('next', data.keys()) self.assertNotIn('next', data)
# Test collection pagination # Test collection pagination
data = self.get_json('/chassis/%s/nodes?limit=1' % chassis.uuid) data = self.get_json('/chassis/%s/nodes?limit=1' % chassis.uuid)
self.assertEqual(1, len(data['nodes'])) self.assertEqual(1, len(data['nodes']))
self.assertIn('next', data.keys()) self.assertIn('next', data)
def test_nodes_subresource_no_uuid(self): def test_nodes_subresource_no_uuid(self):
response = self.get_json('/chassis/nodes', expect_errors=True) response = self.get_json('/chassis/nodes', expect_errors=True)

8
ironic/tests/unit/api/v1/test_nodes.py
View File

@@ -336,7 +336,7 @@ class TestListNodes(test_api_base.BaseApiTest):
uuid = uuidutils.generate_uuid() uuid = uuidutils.generate_uuid()
obj_utils.create_test_node(self.context, uuid=uuid) obj_utils.create_test_node(self.context, uuid=uuid)
data = self.get_json('/nodes/%s' % uuid) data = self.get_json('/nodes/%s' % uuid)
self.assertIn('links', data.keys()) self.assertIn('links', data)
self.assertEqual(2, len(data['links'])) self.assertEqual(2, len(data['links']))
self.assertIn(uuid, data['links'][0]['href']) self.assertIn(uuid, data['links'][0]['href'])
for l in data['links']: for l in data['links']:
@@ -406,7 +406,7 @@ class TestListNodes(test_api_base.BaseApiTest):
def test_ports_subresource_link(self): def test_ports_subresource_link(self):
node = obj_utils.create_test_node(self.context) node = obj_utils.create_test_node(self.context)
data = self.get_json('/nodes/%s' % node.uuid) data = self.get_json('/nodes/%s' % node.uuid)
self.assertIn('ports', data.keys()) self.assertIn('ports', data)
def test_ports_subresource(self): def test_ports_subresource(self):
node = obj_utils.create_test_node(self.context) node = obj_utils.create_test_node(self.context)
@@ -418,12 +418,12 @@ class TestListNodes(test_api_base.BaseApiTest):
data = self.get_json('/nodes/%s/ports' % node.uuid) data = self.get_json('/nodes/%s/ports' % node.uuid)
self.assertEqual(2, len(data['ports'])) self.assertEqual(2, len(data['ports']))
self.assertNotIn('next', data.keys()) self.assertNotIn('next', data)
# Test collection pagination # Test collection pagination
data = self.get_json('/nodes/%s/ports?limit=1' % node.uuid) data = self.get_json('/nodes/%s/ports?limit=1' % node.uuid)
self.assertEqual(1, len(data['ports'])) self.assertEqual(1, len(data['ports']))
self.assertIn('next', data.keys()) self.assertIn('next', data)
def test_ports_subresource_noid(self): def test_ports_subresource_noid(self):
node = obj_utils.create_test_node(self.context) node = obj_utils.create_test_node(self.context)

2
ironic/tests/unit/drivers/modules/amt/test_common.py
View File

@@ -112,7 +112,7 @@ class AMTCommonMethodsTestCase(db_base.DbTestCase):
class AMTCommonClientTestCase(base.TestCase): class AMTCommonClientTestCase(base.TestCase):
def setUp(self): def setUp(self):
super(AMTCommonClientTestCase, self).setUp() super(AMTCommonClientTestCase, self).setUp()
self.info = {key[4:]: INFO_DICT[key] for key in INFO_DICT.keys()} self.info = {key[4:]: INFO_DICT[key] for key in INFO_DICT}
def test_wsman_get(self, mock_client_pywsman): def test_wsman_get(self, mock_client_pywsman):
namespace = resource_uris.CIM_AssociatedPowerManagementService namespace = resource_uris.CIM_AssociatedPowerManagementService