diff options
| -rw-r--r-- | changelogs/fragments/selector_removal.yml | 3 | ||||
| -rw-r--r-- | lib/ansible/compat/selectors.py | 32 | ||||
| -rw-r--r-- | lib/ansible/module_utils/compat/selectors.py | 32 | ||||
| -rw-r--r-- | test/sanity/ignore.txt | 2 |
4 files changed, 3 insertions, 66 deletions
diff --git a/changelogs/fragments/selector_removal.yml b/changelogs/fragments/selector_removal.yml new file mode 100644 index 0000000000..53b263ec03 --- /dev/null +++ b/changelogs/fragments/selector_removal.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - selector - remove deprecated compat.selector related files (https://github.com/ansible/ansible/pull/84155). diff --git a/lib/ansible/compat/selectors.py b/lib/ansible/compat/selectors.py deleted file mode 100644 index 0117f362ad..0000000000 --- a/lib/ansible/compat/selectors.py +++ /dev/null @@ -1,32 +0,0 @@ -# (c) 2014, 2017 Toshio Kuratomi <tkuratomi@ansible.com> -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import annotations - -import sys -import selectors - -from ansible.module_utils.common.warnings import deprecate - - -sys.modules['ansible.compat.selectors'] = selectors - - -deprecate( - msg='The `ansible.module_utils.compat.selectors` module is deprecated.', - version='2.19', -) diff --git a/lib/ansible/module_utils/compat/selectors.py b/lib/ansible/module_utils/compat/selectors.py deleted file mode 100644 index 81082f3fe3..0000000000 --- a/lib/ansible/module_utils/compat/selectors.py +++ /dev/null @@ -1,32 +0,0 @@ -# (c) 2014, 2017 Toshio Kuratomi <tkuratomi@ansible.com> -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import annotations - -import selectors -import sys - -from ansible.module_utils.common.warnings import deprecate - - -sys.modules['ansible.module_utils.compat.selectors'] = selectors - - -deprecate( - msg='The `ansible.module_utils.compat.selectors` module is deprecated.', - version='2.19', -) diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 926fb4bf92..4ec1539100 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -157,9 +157,7 @@ lib/ansible/modules/user.py pylint:used-before-assignment lib/ansible/plugins/action/copy.py pylint:undefined-variable test/integration/targets/module_utils/library/test_optional.py pylint:used-before-assignment test/support/windows-integration/plugins/action/win_copy.py pylint:undefined-variable -lib/ansible/compat/selectors.py pylint:ansible-deprecated-version lib/ansible/module_utils/compat/importlib.py pylint:ansible-deprecated-version -lib/ansible/module_utils/compat/selectors.py pylint:ansible-deprecated-version lib/ansible/module_utils/pycompat24.py pylint:ansible-deprecated-version lib/ansible/plugins/connection/__init__.py pylint:ansible-deprecated-version lib/ansible/plugins/filter/core.py pylint:ansible-deprecated-version |