diff --git a/changelogs/fragments/remove_py3compat.yml b/changelogs/fragments/remove_py3compat.yml new file mode 100644 index 00000000000..2e2ad0739eb --- /dev/null +++ b/changelogs/fragments/remove_py3compat.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - py3compat - remove deprecated ``py3compat.environ`` call. diff --git a/lib/ansible/utils/py3compat.py b/lib/ansible/utils/py3compat.py deleted file mode 100644 index 374a3dbcef2..00000000000 --- a/lib/ansible/utils/py3compat.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# -# (c) 2018, Toshio Kuratomi -# Copyright: Contributors to the Ansible project -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import annotations - -import os - -from ansible.utils.display import Display - - -display = Display() - - -def __getattr__(name): - if name != 'environ': - raise AttributeError(name) - - display.deprecated( - msg='`ansible.utils.py3compat.environ` is deprecated.', - version='2.20', - help_text='Use `os.environ` from the Python standard library instead.', - ) - - return os.environ diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 0751ca5b155..94f0ee69336 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -236,7 +236,6 @@ lib/ansible/cli/doc.py pylint:ansible-deprecated-version # TODO: 2.20 lib/ansible/galaxy/api.py pylint:ansible-deprecated-version # TODO: 2.20 lib/ansible/plugins/filter/encryption.py pylint:ansible-deprecated-version # TODO: 2.20 lib/ansible/utils/encrypt.py pylint:ansible-deprecated-version # TODO: 2.20 -lib/ansible/utils/py3compat.py pylint:ansible-deprecated-version # TODO: 2.20 lib/ansible/utils/ssh_functions.py pylint:ansible-deprecated-version # TODO: 2.20 lib/ansible/vars/manager.py pylint:ansible-deprecated-version-comment # TODO: 2.20 lib/ansible/vars/plugins.py pylint:ansible-deprecated-version # TODO: 2.20