Merge pull request #17191 from mgedmin/fix-import-error-unicode

Fix trivial ImportErrors when trying to use with_fileglob
This commit is contained in:
Abhijit Menon-Sen
2016-08-23 12:06:12 +05:30
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -98,7 +98,7 @@ class LookupBase(with_metaclass(ABCMeta, object)):
must be converted into python's unicode type as the strings will be run must be converted into python's unicode type as the strings will be run
through jinja2 which has this requirement. You can use:: through jinja2 which has this requirement. You can use::
from ansible.module_utils.unicode import to_unicode from ansible.utils.unicode import to_unicode
result_string = to_unicode(result_string) result_string = to_unicode(result_string)
""" """
pass pass

View File

@@ -22,7 +22,7 @@ import glob
from ansible.plugins.lookup import LookupBase from ansible.plugins.lookup import LookupBase
from ansible.errors import AnsibleFileNotFound from ansible.errors import AnsibleFileNotFound
from ansible.module_utils.unicode import to_bytes from ansible.utils.unicode import to_bytes, to_unicode
class LookupModule(LookupBase): class LookupModule(LookupBase):