Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix trivial ImportErrors when trying to use with_fileglob #17191

Merged
merged 2 commits into from
Aug 23, 2016
Merged

Fix trivial ImportErrors when trying to use with_fileglob #17191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
483c83b
There's no ansible.module_utils_unicode
mgedmin Aug 23, 2016
73caff5
Add missing to_unicode import
mgedmin Aug 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ansible/plugins/lookup/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def run(self, terms, variables=None, **kwargs):
must be converted into python's unicode type as the strings will be run
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)
"""
pass
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/plugins/lookup/fileglob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from ansible.plugins.lookup import LookupBase
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):

Expand Down