Merge "Fix py34 error of indexing 'dict_keys' object"

2016-02-27 01:50:06 +00:00
parent f753b61102 3f6b80f514
commit 88c318264c
1 changed files with 1 additions and 1 deletions
--- a/aodh/api/controllers/v2/alarm_rules/composite.py
+++ b/aodh/api/controllers/v2/alarm_rules/composite.py
@@ -52,7 +52,7 @@ class CompositeRule(wtypes.UserType):
    @staticmethod
    def valid_composite_rule(rules):
        if isinstance(rules, dict) and len(rules) == 1:
-            and_or_key = rules.keys()[0]
+            and_or_key = list(rules)[0]
            if and_or_key not in ('and', 'or'):
                raise base.ClientSideError(
                    _('Threshold rules should be combined with "and" or "or"'))