mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-28 14:39:07 +00:00
replace batch of redundant to_native() occurrences (#11098)
* replace batch of redundant to_native() occurrences * add changelog frag
This commit is contained in:
parent
6e1cc3eafd
commit
634be713bb
63 changed files with 164 additions and 157 deletions
|
|
@ -114,7 +114,6 @@ else:
|
|||
pyodbc_found = True
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
|
||||
from ansible.module_utils.common.text.converters import to_native
|
||||
|
||||
|
||||
class NotSupportedError(Exception):
|
||||
|
|
@ -365,23 +364,22 @@ def main():
|
|||
try:
|
||||
changed = absent(user_facts, cursor, user, roles)
|
||||
except pyodbc.Error as e:
|
||||
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||
module.fail_json(msg=f"{e}", exception=traceback.format_exc())
|
||||
elif state in ["present", "locked"]:
|
||||
try:
|
||||
changed = present(
|
||||
user_facts, cursor, user, profile, resource_pool, locked, password, expired, ldap, roles
|
||||
)
|
||||
except pyodbc.Error as e:
|
||||
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||
module.fail_json(msg=f"{e}", exception=traceback.format_exc())
|
||||
except NotSupportedError as e:
|
||||
module.fail_json(msg=to_native(e), ansible_facts={"vertica_users": user_facts})
|
||||
module.fail_json(msg=f"{e}", ansible_facts={"vertica_users": user_facts})
|
||||
except CannotDropError as e:
|
||||
module.fail_json(msg=to_native(e), ansible_facts={"vertica_users": user_facts})
|
||||
module.fail_json(msg=f"{e}", ansible_facts={"vertica_users": user_facts})
|
||||
except SystemExit:
|
||||
# avoid catching this on python 2.4
|
||||
raise
|
||||
except Exception as e:
|
||||
module.fail_json(msg=to_native(e), exception=traceback.format_exc())
|
||||
module.fail_json(msg=f"{e}", exception=traceback.format_exc())
|
||||
|
||||
module.exit_json(changed=changed, user=user, ansible_facts={"vertica_users": user_facts})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue