External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 04:30:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

unicode conversion of paths in inventory import

Browse Source
This commit is contained in:
AlanCoding
2017-01-09 15:10:02 -05:00
parent 9f01338c17
commit 69527fdb08
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/management/commands/inventory_import.py
View File

@@ -64,7 +64,7 @@ class MemObject(object):
all_vars = {} all_vars = {}
files_found = 0 files_found = 0
for suffix in ('', '.yml', '.yaml', '.json'): for suffix in ('', '.yml', '.yaml', '.json'):
path = ''.join([base_path, suffix]) path = ''.join([base_path, suffix]).encode("utf-8")
if not os.path.exists(path): if not os.path.exists(path):
continue continue
if not os.path.isfile(path): if not os.path.isfile(path):
@@ -462,7 +462,7 @@ class ExecutableJsonLoader(BaseLoader):
# to set their variables # to set their variables
for k,v in self.all_group.all_hosts.iteritems(): for k,v in self.all_group.all_hosts.iteritems():
if 'hostvars' not in _meta: if 'hostvars' not in _meta:
data = self.command_to_json([self.source, '--host', k]) data = self.command_to_json([self.source, '--host', k.encode("utf-8")])
else: else:
data = _meta['hostvars'].get(k, {}) data = _meta['hostvars'].get(k, {})
if isinstance(data, dict): if isinstance(data, dict):