cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Be explicit about unicode str transformation

Browse source 
Fixes #10126
This commit is contained in:
Toshio Kuratomi 2015-02-02 13:37:31 -08:00
parent bd7ac7fd7d
commit 6d788629a2
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/callbacks.py
View file

@ -629,7 +629,13 @@ class PlaybookCallbacks(object):
if hasattr(self, 'start_at'): # we still have start_at so skip the task if hasattr(self, 'start_at'): # we still have start_at so skip the task
self.skip_task = True self.skip_task = True
elif hasattr(self, 'step') and self.step: elif hasattr(self, 'step') and self.step:
msg = ('Perform task: %s (y/n/c): ' % name).encode(sys.stdout.encoding) if isinstance(name, str):
name = utils.to_unicode(name)
msg = u'Perform task: %s (y/n/c): ' % name
if sys.stdout.encoding:
msg = msg.encode(sys.stdout.encoding, errors='replace')
else:
msg = msg.encode('utf-8')
resp = raw_input(msg) resp = raw_input(msg)
if resp.lower() in ['y','yes']: if resp.lower() in ['y','yes']:
self.skip_task = False self.skip_task = False