wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ansible-test yamllint: fix UnicodeDecodeError (#55364)

Browse source 
* ansible-test yamllint: fix UnicodeDecodeError

* Conditional fix

(cherry picked from commit f8bebc61c8)
This commit is contained in:
Martin Krizek 2019-04-17 09:13:53 +02:00 committed by Matt Clay
parent c1b640b65d
commit 3ae0296b14
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/runner/lib/util.py
View file

@ -381,7 +381,10 @@ def raw_command(cmd, capture=False, env=None, data=None, cwd=None, explain=False
if communicate: if communicate:
encoding = 'utf-8' encoding = 'utf-8'
data_bytes = data.encode(encoding, 'surrogateescape') if data else None if data is None or isinstance(data, bytes):
data_bytes = data
else:
data_bytes = data.encode(encoding, 'surrogateescape')
stdout_bytes, stderr_bytes = process.communicate(data_bytes) stdout_bytes, stderr_bytes = process.communicate(data_bytes)
stdout_text = stdout_bytes.decode(encoding, str_errors) if stdout_bytes else u'' stdout_text = stdout_bytes.decode(encoding, str_errors) if stdout_bytes else u''
stderr_text = stderr_bytes.decode(encoding, str_errors) if stderr_bytes else u'' stderr_text = stderr_bytes.decode(encoding, str_errors) if stderr_bytes else u''