From ac041e21a0524038da8971ae7730ad588bbc8921 Mon Sep 17 00:00:00 2001 From: cidrblock Date: Tue, 13 Oct 2020 08:50:48 -0700 Subject: [PATCH] Move to common/utils.py --- plugins/filter/paths.py | 2 +- plugins/lookup/get_path.py | 2 +- plugins/lookup/to_paths.py | 2 +- plugins/module_utils/{path_utils.py => common/path.py} | 0 tests/sanity/ignore-2.10.txt | 2 +- tests/sanity/ignore-2.11.txt | 2 +- tests/sanity/ignore-2.9.txt | 2 +- tests/unit/module_utils/test_path_utils.py | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename plugins/module_utils/{path_utils.py => common/path.py} (100%) diff --git a/plugins/filter/paths.py b/plugins/filter/paths.py index 2aad5bb..5db797c 100644 --- a/plugins/filter/paths.py +++ b/plugins/filter/paths.py @@ -17,7 +17,7 @@ from ansible.module_utils.common._collections_compat import ( MutableMapping, ) -from ansible_collections.ansible.utils.plugins.module_utils.path_utils import ( +from ansible_collections.ansible.utils.plugins.module_utils.common.path import ( to_paths, get_path, ) diff --git a/plugins/lookup/get_path.py b/plugins/lookup/get_path.py index 2d46d0b..4d6bc9b 100644 --- a/plugins/lookup/get_path.py +++ b/plugins/lookup/get_path.py @@ -156,7 +156,7 @@ RETURN = """ """ from ansible.plugins.lookup import LookupBase -from ansible_collections.ansible.utils.plugins.module_utils.path_utils import ( +from ansible_collections.ansible.utils.plugins.module_utils.common.path import ( get_path, ) diff --git a/plugins/lookup/to_paths.py b/plugins/lookup/to_paths.py index be8d2c3..f1a2137 100644 --- a/plugins/lookup/to_paths.py +++ b/plugins/lookup/to_paths.py @@ -140,7 +140,7 @@ RETURN = """ """ from ansible.plugins.lookup import LookupBase -from ansible_collections.ansible.utils.plugins.module_utils.path_utils import ( +from ansible_collections.ansible.utils.plugins.module_utils.common.path import ( to_paths, ) diff --git a/plugins/module_utils/path_utils.py b/plugins/module_utils/common/path.py similarity index 100% rename from plugins/module_utils/path_utils.py rename to plugins/module_utils/common/path.py diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index 71674f0..cf4712f 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -1 +1 @@ -plugins/module_utils/path_utils.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node +plugins/module_utils/common/path.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index 71674f0..cf4712f 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -1 +1 @@ -plugins/module_utils/path_utils.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node +plugins/module_utils/common/path.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 71674f0..cf4712f 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -1 +1 @@ -plugins/module_utils/path_utils.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node +plugins/module_utils/common/path.py pylint:ansible-bad-module-import # file's use is limited to filter and lookups on control node diff --git a/tests/unit/module_utils/test_path_utils.py b/tests/unit/module_utils/test_path_utils.py index f9dd975..52430e7 100644 --- a/tests/unit/module_utils/test_path_utils.py +++ b/tests/unit/module_utils/test_path_utils.py @@ -12,7 +12,7 @@ import json import heapq import os import unittest -from ansible_collections.ansible.utils.plugins.module_utils.path_utils import ( +from ansible_collections.ansible.utils.plugins.module_utils.common.path import ( get_path, to_paths, )