cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use six for iteration, to make it run on python3 (#2800)

Browse source
This commit is contained in:
Michael Scherer 2016-08-31 16:15:38 +02:00 committed by Toshio Kuratomi
parent ef6eb80c12
commit a2d3aac8cc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/timezone.py
View file

@ -20,6 +20,7 @@
import os import os
import re import re
from ansible.module_utils.six import iteritems, iterkeys
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
@ -110,7 +111,7 @@ class Timezone(object):
# Initially there's only info of "planned" phase, but the # Initially there's only info of "planned" phase, but the
# `self.check()` function will fill out it. # `self.check()` function will fill out it.
self.value = dict() self.value = dict()
for key in module.argument_spec.iterkeys(): for key in iterkeys(module.argument_spec):
value = module.params[key] value = module.params[key]
if value is not None: if value is not None:
self.value[key] = dict(planned=value) self.value[key] = dict(planned=value)
@ -162,7 +163,7 @@ class Timezone(object):
`--diff` option of ansible-playbook. `--diff` option of ansible-playbook.
""" """
diff = {phase1: {}, phase2: {}} diff = {phase1: {}, phase2: {}}
for key, value in self.value.iteritems(): for key, value in iteritems(self.value):
diff[phase1][key] = value[phase1] diff[phase1][key] = value[phase1]
diff[phase2][key] = value[phase2] diff[phase2][key] = value[phase2]
return diff return diff
@ -178,12 +179,12 @@ class Timezone(object):
""" """
if phase == 'planned': if phase == 'planned':
return return
for key, value in self.value.iteritems(): for key, value in iteritems(self.value):
value[phase] = self.get(key, phase) value[phase] = self.get(key, phase)
def change(self): def change(self):
"""Make the changes effect based on `self.value`.""" """Make the changes effect based on `self.value`."""
for key, value in self.value.iteritems(): for key, value in iteritems(self.value):
if value['before'] != value['planned']: if value['before'] != value['planned']:
self.set(key, value['planned']) self.set(key, value['planned'])