From 0c210428cfc7ccb6d274b013bf5aaa181a2c5681 Mon Sep 17 00:00:00 2001 From: Pavel Bar Date: Sun, 15 Feb 2026 22:56:50 +0200 Subject: [PATCH] Fix deprecated imports in tests/unit/mock/procenv.py Replace deprecated module_utils imports: - ansible.module_utils._text -> ansible.module_utils.common.text.converters - ansible.module_utils.six.PY3 -> removed (Python 2 code paths removed) Fixes #686 Co-authored-by: Cursor AI Signed-off-by: Pavel Bar --- tests/sanity/ignore-2.21.txt | 1 - tests/unit/mock/procenv.py | 15 ++++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index bc694e0..3ebf710 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,4 +1,3 @@ tests/utils/shippable/timing.py shebang -tests/unit/mock/procenv.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 diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py index 4740452..f1541a8 100644 --- a/tests/unit/mock/procenv.py +++ b/tests/unit/mock/procenv.py @@ -26,8 +26,7 @@ import json from contextlib import contextmanager from io import BytesIO, StringIO from ansible_collections.ansible.posix.tests.unit.compat import unittest -from ansible.module_utils.six import PY3 -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes @contextmanager @@ -38,11 +37,8 @@ def swap_stdin_and_argv(stdin_data='', argv_data=tuple()): real_stdin = sys.stdin real_argv = sys.argv - if PY3: - fake_stream = StringIO(stdin_data) - fake_stream.buffer = BytesIO(to_bytes(stdin_data)) - else: - fake_stream = BytesIO(to_bytes(stdin_data)) + fake_stream = StringIO(stdin_data) + fake_stream.buffer = BytesIO(to_bytes(stdin_data)) try: sys.stdin = fake_stream @@ -61,10 +57,7 @@ def swap_stdout(): """ old_stdout = sys.stdout - if PY3: - fake_stream = StringIO() - else: - fake_stream = BytesIO() + fake_stream = StringIO() try: sys.stdout = fake_stream