From e944587a09eb4bd1cbc336b69a54cb745535bce7 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 1 Apr 2026 16:33:47 -0600 Subject: [PATCH] refactor: the ansible six PY2 is deprecated - just use sys.version_info instead Fixes the following ansible-test error: ``` ERROR: plugins/module_utils/certificate_lsr/providers/base.py:90:0: ansible-bad-import-from: Import PY2 from the Python standard library equivalent instead of ansible.module_utils.six ``` PY2 is only used to determine the name of an exception, which can be done using sys.version_info instead. This also adds ansible-test ignores files for all tested versions. Signed-off-by: Rich Megginson --- .sanity-ansible-ignore-2.18.txt | 1 + .sanity-ansible-ignore-2.19.txt | 1 + .sanity-ansible-ignore-2.20.txt | 1 + .sanity-ansible-ignore-2.21.txt | 1 + module_utils/certificate_lsr/providers/base.py | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .sanity-ansible-ignore-2.18.txt create mode 100644 .sanity-ansible-ignore-2.19.txt create mode 100644 .sanity-ansible-ignore-2.20.txt create mode 100644 .sanity-ansible-ignore-2.21.txt diff --git a/.sanity-ansible-ignore-2.18.txt b/.sanity-ansible-ignore-2.18.txt new file mode 100644 index 00000000..b3c573db --- /dev/null +++ b/.sanity-ansible-ignore-2.18.txt @@ -0,0 +1 @@ +plugins/modules/certificate_request.py validate-modules:missing-gplv3-license diff --git a/.sanity-ansible-ignore-2.19.txt b/.sanity-ansible-ignore-2.19.txt new file mode 100644 index 00000000..b3c573db --- /dev/null +++ b/.sanity-ansible-ignore-2.19.txt @@ -0,0 +1 @@ +plugins/modules/certificate_request.py validate-modules:missing-gplv3-license diff --git a/.sanity-ansible-ignore-2.20.txt b/.sanity-ansible-ignore-2.20.txt new file mode 100644 index 00000000..b3c573db --- /dev/null +++ b/.sanity-ansible-ignore-2.20.txt @@ -0,0 +1 @@ +plugins/modules/certificate_request.py validate-modules:missing-gplv3-license diff --git a/.sanity-ansible-ignore-2.21.txt b/.sanity-ansible-ignore-2.21.txt new file mode 100644 index 00000000..b3c573db --- /dev/null +++ b/.sanity-ansible-ignore-2.21.txt @@ -0,0 +1 @@ +plugins/modules/certificate_request.py validate-modules:missing-gplv3-license diff --git a/module_utils/certificate_lsr/providers/base.py b/module_utils/certificate_lsr/providers/base.py index b941fbeb..6e0cf30d 100644 --- a/module_utils/certificate_lsr/providers/base.py +++ b/module_utils/certificate_lsr/providers/base.py @@ -8,6 +8,7 @@ import hashlib import os +import sys import traceback try: @@ -87,10 +88,9 @@ def __getattr__(self, value): HAS_PYASN1 = True PYASN1_IMPORT_ERROR = None -from ansible.module_utils.six import PY2 from ansible.module_utils._text import to_bytes, to_text -if PY2: +if sys.version_info[0] == 2: FileNotFoundError = IOError # pylint: disable=redefined-builtin