mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 07:05:27 +01:00
Compare commits
4 commits
93cd49adba
...
4a7182b194
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a7182b194 | ||
|
|
b769fa0da2 | ||
|
|
f21a136a7a | ||
|
|
e9e6310bc1 |
3 changed files with 12 additions and 8 deletions
6
changelogs/fragments/686_fix_deprecated_imports.yml
Normal file
6
changelogs/fragments/686_fix_deprecated_imports.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
bugfixes:
|
||||||
|
- synchronize - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.common._collections_compat`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
|
||||||
|
- synchronize - fix deprecated ``ansible.module_utils.six`` imports for CI compliance.
|
||||||
|
- mount - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
|
||||||
|
- mount - fix deprecated ``ansible.module_utils.six`` imports for CI compliance.
|
||||||
|
|
@ -18,12 +18,11 @@ from __future__ import (absolute_import, division, print_function)
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
import os.path
|
import os.path
|
||||||
|
from collections.abc import MutableSequence
|
||||||
|
from shlex import quote as shlex_quote
|
||||||
|
|
||||||
from ansible import constants as C
|
from ansible import constants as C
|
||||||
from ansible.module_utils.six import string_types
|
from ansible.module_utils.common.text.converters import to_text
|
||||||
from ansible.module_utils.six.moves import shlex_quote
|
|
||||||
from ansible.module_utils._text import to_text
|
|
||||||
from ansible.module_utils.common._collections_compat import MutableSequence
|
|
||||||
from ansible.module_utils.parsing.convert_bool import boolean
|
from ansible.module_utils.parsing.convert_bool import boolean
|
||||||
from ansible.plugins.action import ActionBase
|
from ansible.plugins.action import ActionBase
|
||||||
from ansible.plugins.loader import connection_loader
|
from ansible.plugins.loader import connection_loader
|
||||||
|
|
@ -417,7 +416,7 @@ class ActionModule(ActionBase):
|
||||||
# Replicate what we do in the module argumentspec handling for lists
|
# Replicate what we do in the module argumentspec handling for lists
|
||||||
if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence):
|
if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence):
|
||||||
tmp_rsync_opts = _tmp_args.get('rsync_opts', [])
|
tmp_rsync_opts = _tmp_args.get('rsync_opts', [])
|
||||||
if isinstance(tmp_rsync_opts, string_types):
|
if isinstance(tmp_rsync_opts, str):
|
||||||
tmp_rsync_opts = tmp_rsync_opts.split(',')
|
tmp_rsync_opts = tmp_rsync_opts.split(',')
|
||||||
elif isinstance(tmp_rsync_opts, (int, float)):
|
elif isinstance(tmp_rsync_opts, (int, float)):
|
||||||
tmp_rsync_opts = [to_text(tmp_rsync_opts)]
|
tmp_rsync_opts = [to_text(tmp_rsync_opts)]
|
||||||
|
|
|
||||||
|
|
@ -225,8 +225,7 @@ import platform
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
|
from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||||
from ansible.module_utils._text import to_bytes, to_native
|
|
||||||
from ansible.module_utils.parsing.convert_bool import boolean
|
from ansible.module_utils.parsing.convert_bool import boolean
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -279,7 +278,7 @@ def _set_mount_save_old(module, args):
|
||||||
old_lines = []
|
old_lines = []
|
||||||
exists = False
|
exists = False
|
||||||
changed = False
|
changed = False
|
||||||
escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args)])
|
escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()])
|
||||||
new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
|
new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
|
||||||
|
|
||||||
if platform.system() == 'SunOS':
|
if platform.system() == 'SunOS':
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue