summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-06-10 04:12:50 +0000
committerGerrit Code Review <review@openstack.org>2014-06-10 04:12:50 +0000
commit339b55c319f0f7cbd2a8025d4eff47351d66a997 (patch)
tree0d9d8c61f7761a443c82e258c76abcfdfb713781
parentb08cbfeb313ccf075df1b316c1e7332d67532d66 (diff)
parentda47380ae7460a37bde4fbd4ce10017ea8a4a6b2 (diff)
downloadpython-ceilometerclient-339b55c319f0f7cbd2a8025d4eff47351d66a997.tar.gz
Merge "replace dict.iteritems() with six.iteritems(dict)"
-rw-r--r--ceilometerclient/v2/shell.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index 0fe0d17..c603814 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -204,7 +204,7 @@ def _display_rule(type, rule):
else:
# just dump all
return "\n".join(["%s: %s" % (f, v)
- for f, v in rule.iteritems()])
+ for f, v in six.iteritems(rule)])
def alarm_rule_formatter(alarm):