summaryrefslogtreecommitdiff
path: root/nova/policy.py
diff options
context:
space:
mode:
authorSpencer Yu <yushb@gohighsec.com>2016-12-20 23:43:53 -0800
committerSpencer Yu <yushb@gohighsec.com>2017-01-09 09:11:00 +0000
commit70730c09abd3e0e7d0162dd1a942c6671c57f0eb (patch)
tree2cd21731d71bb7049092f42879726c86d44cced2 /nova/policy.py
parentf55815b2f90b934801a88e10bf750876b0587328 (diff)
downloadnova-70730c09abd3e0e7d0162dd1a942c6671c57f0eb.tar.gz
[2/3]Replace six.iteritems() with .items()
1.As mentioned in [1], we should avoid using six.iteritems to achieve iterators. We can use dict.items 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 The patch list: 1. cells. 2. compute api. 3. image. 4. network. 5. objects. 6. scheduler. 7. virt. 8. other resources. Partial-Implements: blueprint replace-iteritems-with-items Change-Id: Ic6e469eb80ee1774de1374bb36f38b5134b6b311
Diffstat (limited to 'nova/policy.py')
-rw-r--r--nova/policy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/policy.py b/nova/policy.py
index 6f81fddec9..843c426898 100644
--- a/nova/policy.py
+++ b/nova/policy.py
@@ -22,7 +22,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_policy import policy
from oslo_utils import excutils
-import six
+
from nova import exception
from nova.i18n import _LE, _LW
@@ -89,7 +89,7 @@ def _serialize_rules(rules):
rules list.
"""
result = [(rule_name, str(rule))
- for rule_name, rule in six.iteritems(rules)]
+ for rule_name, rule in rules.items()]
return sorted(result, key=lambda rule: rule[0])