Add some missing imports from last night's py3 fixes (#17196)

pull/17130/merge
Toshio Kuratomi 8 years ago committed by GitHub
parent 0b070a04d0
commit 76f9935634

@ -292,7 +292,7 @@ class DataLoader():
result = None result = None
if not source: 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): elif source.startswith('~') or source.startswith(os.path.sep):
# path is absolute, no relative needed, check existence and return source # path is absolute, no relative needed, check existence and return source
test_path = unfrackpath(b_source) test_path = unfrackpath(b_source)

@ -30,6 +30,7 @@ except ImportError:
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
from ansible.utils.unicode import to_bytes
def _parse_params(term): def _parse_params(term):

@ -21,7 +21,7 @@ import os
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
from ansible.utils.unicode import to_unicode from ansible.utils.unicode import to_unicode, to_bytes
try: try:
from __main__ import display from __main__ import display

Loading…
Cancel
Save