From ef8bec18bf508da9307783068873abf9b21db713 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 26 Feb 2016 08:59:49 -0800 Subject: [PATCH] Use a unicode format string so that we don't convert to byte strings Fixes #14349 --- lib/ansible/executor/playbook_executor.py | 3 ++- lib/ansible/parsing/yaml/constructor.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/executor/playbook_executor.py b/lib/ansible/executor/playbook_executor.py index ce91b7f6025..31d62984508 100644 --- a/lib/ansible/executor/playbook_executor.py +++ b/lib/ansible/executor/playbook_executor.py @@ -27,6 +27,7 @@ from ansible import constants as C from ansible.executor.task_queue_manager import TaskQueueManager from ansible.playbook import Playbook from ansible.template import Templar +from ansible.utils.unicode import to_unicode try: from __main__ import display @@ -81,7 +82,7 @@ class PlaybookExecutor: i = 1 plays = pb.get_plays() - display.vv('%d plays in %s' % (len(plays), playbook_path)) + display.vv(u'%d plays in %s' % (len(plays), to_unicode(playbook_path))) for play in plays: if play._included_path is not None: diff --git a/lib/ansible/parsing/yaml/constructor.py b/lib/ansible/parsing/yaml/constructor.py index 164d23b497e..6c984ad0802 100644 --- a/lib/ansible/parsing/yaml/constructor.py +++ b/lib/ansible/parsing/yaml/constructor.py @@ -66,7 +66,7 @@ class AnsibleConstructor(Constructor): "found unacceptable key (%s)" % exc, key_node.start_mark) if key in mapping: - display.warning('While constructing a mapping from {1}, line {2}, column {3}, found a duplicate dict key ({0}). Using last defined value only.'.format(key, *mapping.ansible_pos)) + display.warning(u'While constructing a mapping from {1}, line {2}, column {3}, found a duplicate dict key ({0}). Using last defined value only.'.format(key, *mapping.ansible_pos)) value = self.construct_object(value_node, deep=deep) mapping[key] = value