openstack/aodh
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2016-02-27 01:50:06 +00:00
committed by Gerrit Code Review
parent f753b61102 3f6b80f514
commit 88c318264c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aodh/api/controllers/v2/alarm_rules/composite.py
View File

@@ -52,7 +52,7 @@ class CompositeRule(wtypes.UserType):
@staticmethod @staticmethod
def valid_composite_rule(rules): def valid_composite_rule(rules):
if isinstance(rules, dict) and len(rules) == 1: 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'): if and_or_key not in ('and', 'or'):
raise base.ClientSideError( raise base.ClientSideError(
_('Threshold rules should be combined with "and" or "or"')) _('Threshold rules should be combined with "and" or "or"'))