carroarmato0/ansible.posix
1
0
Fork 0
mirror of https://github.com/ansible-collections/ansible.posix.git synced 2026-03-07 10:05:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix deprecated imports in tests/unit/mock/yaml_helper.py

Browse source 
Replace deprecated module_utils import:
- ansible.module_utils.six.PY3 -> removed (Python 2 code paths removed)

Related to #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 b5c50b6881
commit ab24f41cbd
2 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/sanity/ignore-2.21.txt
View file

@ -1,3 +1,2 @@
tests/utils/shippable/timing.py shebang tests/utils/shippable/timing.py shebang
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

27
tests/unit/mock/yaml_helper.py
View file

@ -5,7 +5,6 @@ __metaclass__ = type
import io import io
import yaml import yaml
from ansible.module_utils.six import PY3
from ansible.parsing.yaml.loader import AnsibleLoader from ansible.parsing.yaml.loader import AnsibleLoader
from ansible.parsing.yaml.dumper import AnsibleDumper from ansible.parsing.yaml.dumper import AnsibleDumper
@ -20,17 +19,11 @@ class YamlTestUtils(object):
def _dump_stream(self, obj, stream, dumper=None): def _dump_stream(self, obj, stream, dumper=None):
"""Dump to a py2-unicode or py3-string stream.""" """Dump to a py2-unicode or py3-string stream."""
if PY3: return yaml.dump(obj, stream, Dumper=dumper)
return yaml.dump(obj, stream, Dumper=dumper)
else:
return yaml.dump(obj, stream, Dumper=dumper, encoding=None)
def _dump_string(self, obj, dumper=None): def _dump_string(self, obj, dumper=None):
"""Dump to a py2-unicode or py3-string""" """Dump to a py2-unicode or py3-string"""
if PY3: return yaml.dump(obj, Dumper=dumper)
return yaml.dump(obj, Dumper=dumper)
else:
return yaml.dump(obj, Dumper=dumper, encoding=None)
def _dump_load_cycle(self, obj): def _dump_load_cycle(self, obj):
# Each pass though a dump or load revs the 'generation' # Each pass though a dump or load revs the 'generation'
@ -88,12 +81,8 @@ class YamlTestUtils(object):
stream_obj_from_stream = io.StringIO() stream_obj_from_stream = io.StringIO()
stream_obj_from_string = io.StringIO() stream_obj_from_string = io.StringIO()
if PY3: yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper)
yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper) yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper)
yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper)
else:
yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper, encoding=None)
yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper, encoding=None)
yaml_string_stream_obj_from_stream = stream_obj_from_stream.getvalue() yaml_string_stream_obj_from_stream = stream_obj_from_stream.getvalue()
yaml_string_stream_obj_from_string = stream_obj_from_string.getvalue() yaml_string_stream_obj_from_string = stream_obj_from_string.getvalue()
@ -101,12 +90,8 @@ class YamlTestUtils(object):
stream_obj_from_stream.seek(0) stream_obj_from_stream.seek(0)
stream_obj_from_string.seek(0) stream_obj_from_string.seek(0)
if PY3: yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper)
yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper) yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper)
yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper)
else:
yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper, encoding=None)
yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper, encoding=None)
assert yaml_string == yaml_string_obj_from_stream assert yaml_string == yaml_string_obj_from_stream
assert yaml_string == yaml_string_obj_from_stream == yaml_string_obj_from_string assert yaml_string == yaml_string_obj_from_stream == yaml_string_obj_from_string