From a42623252375cfa96bb881ae2d1a0a2bb48acefa Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 12 Feb 2023 22:09:02 +0100 Subject: [PATCH] Fix imports. (#585) --- plugins/module_utils/_api/_import_helper.py | 6 +++--- plugins/module_utils/common.py | 2 +- plugins/module_utils/common_api.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/module_utils/_api/_import_helper.py b/plugins/module_utils/_api/_import_helper.py index 9ff1cad5..f3ea504c 100644 --- a/plugins/module_utils/_api/_import_helper.py +++ b/plugins/module_utils/_api/_import_helper.py @@ -21,9 +21,9 @@ BACKPORTS_SSL_MATCH_HOSTNAME_IMPORT_ERROR = None try: - from requests import Session - from requests.adapters import HTTPAdapter - from requests.exceptions import HTTPError, InvalidSchema + from requests import Session # noqa: F401, pylint: disable=unused-import + from requests.adapters import HTTPAdapter # noqa: F401, pylint: disable=unused-import + from requests.exceptions import HTTPError, InvalidSchema # noqa: F401, pylint: disable=unused-import except ImportError: REQUESTS_IMPORT_ERROR = traceback.format_exc() diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index b96bc553..e6a06ed6 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -67,7 +67,7 @@ except ImportError: try: - from requests.exceptions import RequestException + from requests.exceptions import RequestException # noqa: F401, pylint: disable=unused-import except ImportError: # Either Docker SDK for Python is no longer using requests, or Docker SDK for Python isn't around either, # or Docker SDK for Python's dependency requests is missing. In any case, define an exception diff --git a/plugins/module_utils/common_api.py b/plugins/module_utils/common_api.py index 439be40a..7d46a153 100644 --- a/plugins/module_utils/common_api.py +++ b/plugins/module_utils/common_api.py @@ -19,7 +19,7 @@ from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FA from ansible_collections.community.docker.plugins.module_utils.version import LooseVersion try: - from requests.exceptions import RequestException, SSLError + from requests.exceptions import RequestException, SSLError # noqa: F401, pylint: disable=unused-import except ImportError: # Define an exception class RequestException so that our code doesn't break. class RequestException(Exception):