ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Removed dict.iteritems() in modules. (#18859)

Browse source 
This is for py3 compatibility, addressed in #18506
This commit is contained in:
Andrea Tartaglia 2016-12-12 23:16:23 +00:00 • committed by Toshio Kuratomi
parent 4b27d08643
commit ef391a11ec
99 changed files with 251 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/clustering/consul_acl.py
View file

@ -217,7 +217,7 @@ def load_rules_for_token(module, consul_api, token):
if info and info['Rules']:
rule_set = hcl.loads(to_ascii(info['Rules']))
for rule_type in rule_set:
for pattern, policy in rule_set[rule_type].iteritems():
for pattern, policy in rule_set[rule_type].items():
rules.add_rule(rule_type, Rule(pattern, policy['policy']))
return rules
except Exception as e:
@ -272,7 +272,7 @@ class Rules:
rules = ""
for rule_type in RULE_TYPES:
for pattern, rule in self.rules[rule_type].iteritems():
for pattern, rule in self.rules[rule_type].items():
rules += template % (rule_type, pattern, rule.policy)
return to_ascii(rules)
@ -288,7 +288,7 @@ class Rules:
return False
for rule_type in RULE_TYPES:
for name, other_rule in other.rules[rule_type].iteritems():
for name, other_rule in other.rules[rule_type].items():
if not name in self.rules[rule_type]:
return False
rule = self.rules[rule_type][name]