Skip to content

Commit

Permalink
Merge pull request ansible#17191 from mgedmin/fix-import-error-unicode
Browse files Browse the repository at this point in the history
Fix trivial ImportErrors when trying to use with_fileglob
  • Loading branch information
amenonsen authored Aug 23, 2016
2 parents 313d4b2 + 73caff5 commit 6f678e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/ansible/plugins/lookup/__init__.py
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
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

0 comments on commit 6f678e3

Please sign in to comment.