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