mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-26 05:50:36 -07:00
Remove all usage of ansible.module_utils.six from main branch (#10888)
* Get rid of all six.moves imports. * Get rid of iteritems. * Get rid of *_type(s) aliases. * Replace StringIO import. * Get rid of PY2/PY3 constants. * Get rid of raise_from. * Get rid of python_2_unicode_compatible. * Clean up global six imports. * Remove all usage of ansible.module_utils.six. * Linting. * Fix xml module. * Docs adjustments.
This commit is contained in:
parent
8f8a0e1d7c
commit
a8977afb04
113 changed files with 188 additions and 352 deletions
|
|
@ -71,7 +71,6 @@ import string
|
|||
import filecmp
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule, get_distribution
|
||||
from ansible.module_utils.six import iteritems
|
||||
|
||||
|
||||
class Timezone(object):
|
||||
|
|
@ -189,7 +188,7 @@ class Timezone(object):
|
|||
`--diff` option of ansible-playbook.
|
||||
"""
|
||||
diff = {phase1: {}, phase2: {}}
|
||||
for key, value in iteritems(self.value):
|
||||
for key, value in self.value.items():
|
||||
diff[phase1][key] = value[phase1]
|
||||
diff[phase2][key] = value[phase2]
|
||||
return diff
|
||||
|
|
@ -205,12 +204,12 @@ class Timezone(object):
|
|||
"""
|
||||
if phase == 'planned':
|
||||
return
|
||||
for key, value in iteritems(self.value):
|
||||
for key, value in self.value.items():
|
||||
value[phase] = self.get(key, phase)
|
||||
|
||||
def change(self):
|
||||
"""Make the changes effect based on `self.value`."""
|
||||
for key, value in iteritems(self.value):
|
||||
for key, value in self.value.items():
|
||||
if value['before'] != value['planned']:
|
||||
self.set(key, value['planned'])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue