openstack/cinder
Code Issues Proposed changes

Merge "Replace dict.iteritems/iterkeys with dict.items/keys"

Browse Source
This commit is contained in:
Jenkins 2017-08-22 11:08:08 +00:00 committed by Gerrit Code Review
commit 42746c68dd
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/drivers/ibm/ibm_storage/proxy.py
View File

@ -360,7 +360,7 @@ class IBMStorageProxy(object):
if not self.targets:
return None
try:
target = self.targets.iterkeys().next()
target = self.targets.keys().next()
return target
except Exception:
return None
@ -393,6 +393,6 @@ class IBMStorageProxy(object):
else:
self.targets[backend_id] = {}
device = self.targets[backend_id]
for k, v in dev.iteritems():
for k, v in dev.items():
if k != 'backend_id':
device[k] = v

3
cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py
View File

@ -1606,8 +1606,7 @@ class XIVProxy(proxy.IBMStorageProxy):
self.meta['stat']['rpo'] = repl.Replication.get_supported_rpo()
self.meta['stat']['replication_count'] = len(self.targets)
self.meta['stat']['replication_targets'] = [target for target in
six.iterkeys(
self.targets)]
self.targets.keys()]
self.meta['stat']['timestamp'] = datetime.datetime.utcnow()