From 639e3e30d7765546d4b337da562edeab4349df89 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 3 Feb 2023 14:20:44 -0800 Subject: [PATCH] Remove unused internal imports from module_utils (#79906) --- changelogs/fragments/unused-imports-module-utils-internal.yml | 4 ++++ lib/ansible/module_utils/common/file.py | 2 -- lib/ansible/module_utils/common/parameters.py | 1 - lib/ansible/module_utils/facts/system/caps.py | 1 - lib/ansible/module_utils/yumdnf.py | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/unused-imports-module-utils-internal.yml diff --git a/changelogs/fragments/unused-imports-module-utils-internal.yml b/changelogs/fragments/unused-imports-module-utils-internal.yml new file mode 100644 index 00000000000..d9d88c42cdf --- /dev/null +++ b/changelogs/fragments/unused-imports-module-utils-internal.yml @@ -0,0 +1,4 @@ +minor_changes: + - > + Remove unused internal imports from module_utils which were not present for backwards compatibility in: + common.file, common.parameters, facts.system.caps, yumdnf diff --git a/lib/ansible/module_utils/common/file.py b/lib/ansible/module_utils/common/file.py index 1e836607acc..045565be63c 100644 --- a/lib/ansible/module_utils/common/file.py +++ b/lib/ansible/module_utils/common/file.py @@ -17,8 +17,6 @@ import fcntl import sys from contextlib import contextmanager -from ansible.module_utils._text import to_bytes, to_native, to_text -from ansible.module_utils.six import b, binary_type from ansible.module_utils.common.warnings import deprecate try: diff --git a/lib/ansible/module_utils/common/parameters.py b/lib/ansible/module_utils/common/parameters.py index 059ca0af513..7e63456115f 100644 --- a/lib/ansible/module_utils/common/parameters.py +++ b/lib/ansible/module_utils/common/parameters.py @@ -13,7 +13,6 @@ from itertools import chain from ansible.module_utils.common.collections import is_iterable from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text -from ansible.module_utils.common.text.formatters import lenient_lowercase from ansible.module_utils.common.warnings import warn from ansible.module_utils.errors import ( AliasError, diff --git a/lib/ansible/module_utils/facts/system/caps.py b/lib/ansible/module_utils/facts/system/caps.py index 6a1e26d527c..3692f2079a0 100644 --- a/lib/ansible/module_utils/facts/system/caps.py +++ b/lib/ansible/module_utils/facts/system/caps.py @@ -20,7 +20,6 @@ __metaclass__ = type import ansible.module_utils.compat.typing as t -from ansible.module_utils._text import to_text from ansible.module_utils.facts.collector import BaseFactCollector diff --git a/lib/ansible/module_utils/yumdnf.py b/lib/ansible/module_utils/yumdnf.py index e265a2d34f5..27bc8ba2d24 100644 --- a/lib/ansible/module_utils/yumdnf.py +++ b/lib/ansible/module_utils/yumdnf.py @@ -18,7 +18,6 @@ import glob import tempfile from abc import ABCMeta, abstractmethod -from ansible.module_utils._text import to_native from ansible.module_utils.six import with_metaclass yumdnf_argument_spec = dict(