diff options
author | koralsky <karol.ossowski@gmail.com> | 2016-11-22 20:22:24 +0100 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-11-22 11:23:57 -0800 |
commit | bf8902f371dcf05d9bb2684baf1641171c174f1a (patch) | |
tree | b0d562a8fab0263e16a1f3ce3de6cddd906fe287 | |
parent | 27be8a10222fbf7a7a4b51c642170e11f2823d39 (diff) | |
download | ansible-bf8902f371dcf05d9bb2684baf1641171c174f1a.tar.gz |
import reduce from six label:python3 (#18561)
* import 'reduce' from six
* import reduce in facts fix
(cherry picked from commit 4e194d71bde5ab2176d78059440290c7e6d24e91)
-rw-r--r-- | lib/ansible/module_utils/facts.py | 4 | ||||
-rw-r--r-- | lib/ansible/plugins/callback/profile_tasks.py | 1 | ||||
-rw-r--r-- | lib/ansible/plugins/strategy/debug.py | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 97c22a3f4d..94b94aa695 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -34,8 +34,8 @@ import pwd from ansible.module_utils.basic import get_all_subclasses from ansible.module_utils.six import PY3, iteritems -from ansible.module_utils.six.moves import configparser, StringIO -from ansible.module_utils._text import to_native +from ansible.module_utils.six.moves import configparser, StringIO, reduce +from ansible.module_utils._text import to_native, to_text try: import selinux diff --git a/lib/ansible/plugins/callback/profile_tasks.py b/lib/ansible/plugins/callback/profile_tasks.py index a6a4a15099..3c3726be5b 100644 --- a/lib/ansible/plugins/callback/profile_tasks.py +++ b/lib/ansible/plugins/callback/profile_tasks.py @@ -28,6 +28,7 @@ import os import time from ansible.plugins.callback import CallbackBase +from ansible.compat.six.moves import reduce # define start time t0 = tn = time.time() diff --git a/lib/ansible/plugins/strategy/debug.py b/lib/ansible/plugins/strategy/debug.py index 931474088a..61159d5fab 100644 --- a/lib/ansible/plugins/strategy/debug.py +++ b/lib/ansible/plugins/strategy/debug.py @@ -7,6 +7,7 @@ import pprint import sys from ansible.plugins.strategy.linear import StrategyModule as LinearStrategyModule +from ansible.compat.six.moves import reduce try: from __main__ import display |