From 76f9935634724118d316d2687876424a70882b8b Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 23 Aug 2016 08:06:20 -0700 Subject: [PATCH] Add some missing imports from last night's py3 fixes (#17196) --- lib/ansible/parsing/dataloader.py | 2 +- lib/ansible/plugins/lookup/ini.py | 1 + lib/ansible/plugins/lookup/template.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/parsing/dataloader.py b/lib/ansible/parsing/dataloader.py index 34958fc1dc..d0db34ce31 100644 --- a/lib/ansible/parsing/dataloader.py +++ b/lib/ansible/parsing/dataloader.py @@ -292,7 +292,7 @@ class DataLoader(): result = None if not source: - display.warning('Invalid request to find a file that matches an empty string or "null" value') + display.warning('Invalid request to find a file that matches an empty string or "null" value') elif source.startswith('~') or source.startswith(os.path.sep): # path is absolute, no relative needed, check existence and return source test_path = unfrackpath(b_source) diff --git a/lib/ansible/plugins/lookup/ini.py b/lib/ansible/plugins/lookup/ini.py index 124b878d98..5425a115f8 100644 --- a/lib/ansible/plugins/lookup/ini.py +++ b/lib/ansible/plugins/lookup/ini.py @@ -30,6 +30,7 @@ except ImportError: from ansible.errors import AnsibleError from ansible.plugins.lookup import LookupBase +from ansible.utils.unicode import to_bytes def _parse_params(term): diff --git a/lib/ansible/plugins/lookup/template.py b/lib/ansible/plugins/lookup/template.py index f39ef2cc6f..2c722945d0 100644 --- a/lib/ansible/plugins/lookup/template.py +++ b/lib/ansible/plugins/lookup/template.py @@ -21,7 +21,7 @@ import os from ansible.errors import AnsibleError from ansible.plugins.lookup import LookupBase -from ansible.utils.unicode import to_unicode +from ansible.utils.unicode import to_unicode, to_bytes try: from __main__ import display