From 48789c4efcadc60a13420d97be526e9b14826e95 Mon Sep 17 00:00:00 2001 From: sivel / Matt Martz Date: Thu, 16 Oct 2025 13:02:05 -0500 Subject: [PATCH] [stable-2.20] Don't deprecate six yet (#86020) (#86021) * [stable-2.20] Don't deprecate six yet (#86020) (cherry picked from commit 1a3e63c) --- changelogs/fragments/deprecate-six.yml | 2 -- lib/ansible/module_utils/six/__init__.py | 8 -------- 2 files changed, 10 deletions(-) delete mode 100644 changelogs/fragments/deprecate-six.yml diff --git a/changelogs/fragments/deprecate-six.yml b/changelogs/fragments/deprecate-six.yml deleted file mode 100644 index 034f1957982..00000000000 --- a/changelogs/fragments/deprecate-six.yml +++ /dev/null @@ -1,2 +0,0 @@ -deprecated_features: - - Deprecate the ``ansible.module_utils.six`` module. Use the Python standard library equivalent instead. diff --git a/lib/ansible/module_utils/six/__init__.py b/lib/ansible/module_utils/six/__init__.py index e8036aa66da..20504cbeddb 100644 --- a/lib/ansible/module_utils/six/__init__.py +++ b/lib/ansible/module_utils/six/__init__.py @@ -33,14 +33,6 @@ import operator import sys import types -from ansible.module_utils.common import warnings as _warnings - -_warnings.deprecate( - msg="The `ansible.module_utils.six` module is deprecated.", - help_text="Use the Python standard library equivalent instead.", - version="2.24", -) - # The following makes it easier for us to script updates of the bundled code. It is not part of # upstream six _BUNDLED_METADATA = {"pypi_name": "six", "version": "1.17.0"}