Fix deprecated imports in plugins/shell/fish.py

Replace deprecated module_utils imports:
- ansible.module_utils.six.text_type -> str
- ansible.module_utils.six.moves.shlex_quote -> shlex.quote

Fixes #686

Co-authored-by: Cursor AI
Signed-off-by: Pavel Bar <pbar@redhat.com>
This commit is contained in:
Pavel Bar 2026-02-15 22:56:50 +02:00
parent 1d76c2ff5f
commit a9bdfed194
2 changed files with 2 additions and 4 deletions

View file

@ -13,8 +13,7 @@ DOCUMENTATION = '''
- shell_common - shell_common
''' '''
from ansible.module_utils.six import text_type from shlex import quote as shlex_quote
from ansible.module_utils.six.moves import shlex_quote
from ansible.plugins.shell.sh import ShellModule as ShModule from ansible.plugins.shell.sh import ShellModule as ShModule
@ -42,7 +41,7 @@ class ShellModule(ShModule):
if v is None: if v is None:
ret.append('set -e %s;' % k) ret.append('set -e %s;' % k)
else: else:
ret.append('set -lx %s %s;' % (k, shlex_quote(text_type(v)))) ret.append('set -lx %s %s;' % (k, shlex_quote(str(v))))
return ' '.join(ret) return ' '.join(ret)
def build_module_command(self, env_string, shebang, cmd, arg_path=None): def build_module_command(self, env_string, shebang, cmd, arg_path=None):

View file

@ -1,5 +1,4 @@
tests/utils/shippable/timing.py shebang tests/utils/shippable/timing.py shebang
plugins/shell/fish.py pylint:ansible-bad-import-from
tests/unit/mock/procenv.py pylint:ansible-bad-import-from tests/unit/mock/procenv.py pylint:ansible-bad-import-from
tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from
tests/unit/modules/conftest.py pylint:ansible-bad-import-from tests/unit/modules/conftest.py pylint:ansible-bad-import-from