diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 117d7d1dfb..28c6ec162d 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -164,7 +164,7 @@ class ProjectOptions(models.Model): results = [] project_path = self.get_project_path() if project_path: - for dirpath, dirnames, filenames in os.walk(project_path): + for dirpath, dirnames, filenames in os.walk(unicode(project_path)): for filename in filenames: if os.path.splitext(filename)[-1] not in ['.yml', '.yaml']: continue diff --git a/awx/main/tests/base.py b/awx/main/tests/base.py index c8b023e92a..8da29fa53e 100644 --- a/awx/main/tests/base.py +++ b/awx/main/tests/base.py @@ -182,7 +182,7 @@ class BaseTestMixin(object): self._temp_paths.append(project_dir) # Create temp playbook in project (if playbook content is given). if playbook_content: - handle, playbook_path = tempfile.mkstemp(suffix='.yml', + handle, playbook_path = tempfile.mkstemp(suffix=u'\u2620.yml', dir=project_dir) test_playbook_file = os.fdopen(handle, 'w') test_playbook_file.write(playbook_content.encode('utf-8')) @@ -210,7 +210,7 @@ class BaseTestMixin(object): self.object_ctr = self.object_ctr + 1 results.append(self.make_project( name="proj%s-%s" % (x, self.object_ctr), - description="proj%s" % x, + description=u"proj%s" % x, created_by=created_by, playbook_content=playbook_content, role_playbooks=role_playbooks,