From ecc67950bb30e29b8260be058a9ebb815566a010 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Wed, 9 Jun 2021 13:04:59 +0200 Subject: [PATCH] functools provide reduce instead of the ansible The ansible 'reduce' function is itself imported from the functools: https://github.com/ansible/ansible/blob/devel/lib/ansible/module_utils/six/__init__.py#L273 And thus provides exactly the same functionality. Furthermore, the functools is part of python lib since 2.7, so the result should be compatible across all of our releases. Signed-off-by: Jiri Podivin Change-Id: I981512fa81f0eb2aac0a50a4709c517cce794fa8 --- validations_common/callback_plugins/validation_json.py | 2 +- validations_common/callback_plugins/validation_stdout.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/validations_common/callback_plugins/validation_json.py b/validations_common/callback_plugins/validation_json.py index 1286f60..6c596a4 100644 --- a/validations_common/callback_plugins/validation_json.py +++ b/validations_common/callback_plugins/validation_json.py @@ -19,8 +19,8 @@ import time import os from functools import partial +from functools import reduce -from ansible.module_utils.six.moves import reduce from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase diff --git a/validations_common/callback_plugins/validation_stdout.py b/validations_common/callback_plugins/validation_stdout.py index 669689b..65b864c 100644 --- a/validations_common/callback_plugins/validation_stdout.py +++ b/validations_common/callback_plugins/validation_stdout.py @@ -16,7 +16,7 @@ __metaclass__ = type import datetime import os -from ansible.module_utils.six.moves import reduce +from functools import reduce from ansible.plugins.callback import CallbackBase DOCUMENTATION = '''