ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-26 13:56:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove all usage of ansible.module_utils.six from main branch (#10888)

Browse source 
* 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:
Felix Fontein 2025-10-11 08:21:57 +02:00 • committed by GitHub
commit a8977afb04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
113 changed files with 188 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/modules/cobbler_system.py
View file

@ -148,10 +148,9 @@ system:
"""
import ssl
import xmlrpc.client as xmlrpc_client
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.six import iteritems
from ansible.module_utils.six.moves import xmlrpc_client
from ansible.module_utils.common.text.converters import to_text
from ansible_collections.community.general.plugins.module_utils.datetime import (
@ -281,7 +280,7 @@ def main():
else:
system_id = conn.get_system_handle(name, token)
for key, value in iteritems(module.params['properties']):
for key, value in module.params['properties'].items():
if key not in system:
module.warn("Property '{0}' is not a valid system property.".format(key))
if system[key] != value:
@ -298,7 +297,7 @@ def main():
result['changed'] = True
if module.params['properties']:
for key, value in iteritems(module.params['properties']):
for key, value in module.params['properties'].items():
try:
conn.modify_system(system_id, key, value, token)
except Exception as e:
@ -307,8 +306,8 @@ def main():
# Add interface properties
interface_properties = dict()
if module.params['interfaces']:
for device, values in iteritems(module.params['interfaces']):
for key, value in iteritems(values):
for device, values in module.params['interfaces'].items():
for key, value in values.items():
if key == 'name':
continue
if key not in IFPROPS_MAPPING: