Fix several things causing tracebacks with unicode cwd (#27731)

Fixes #27511
This commit is contained in:
Toshio Kuratomi 2017-08-04 06:25:08 -07:00 committed by Sam Doran
commit 3f12fccd02
4 changed files with 6 additions and 6 deletions

View file

@ -35,7 +35,7 @@ __metaclass__ = type
import os
from ansible import constants as C
from ansible.errors import AnsibleParserError
from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils._text import to_bytes, to_native, to_text
from ansible.plugins.vars import BaseVarsPlugin
from ansible.inventory.host import Host
from ansible.inventory.group import Group
@ -87,7 +87,7 @@ class VarsModule(BaseVarsPlugin):
data = combine_vars(data, new_data)
except Exception as e:
raise AnsibleParserError(to_text(e))
raise AnsibleParserError(to_native(e))
return data
def _find_vars_files(self, path, name):