From adb0ce309b92de60afd028a72e2e80cf165430b7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Tue, 2 Jan 2018 22:18:57 +0100 Subject: Don't use from ansible.module_utils.six as its no longer available in Ansible 2.4 --- utils/src/ooinstall/ansible_plugins/facts_callback.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'utils') diff --git a/utils/src/ooinstall/ansible_plugins/facts_callback.py b/utils/src/ooinstall/ansible_plugins/facts_callback.py index 433e29dde..6251cd22b 100644 --- a/utils/src/ooinstall/ansible_plugins/facts_callback.py +++ b/utils/src/ooinstall/ansible_plugins/facts_callback.py @@ -7,11 +7,7 @@ import yaml from ansible.plugins.callback import CallbackBase from ansible.parsing.yaml.dumper import AnsibleDumper -# ansible.compat.six goes away with Ansible 2.4 -try: - from ansible.compat.six import u -except ImportError: - from ansible.module_utils.six import u +from ansible.module_utils.six import u # pylint: disable=super-init-not-called -- cgit v1.2.3