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

Fix docker_service python3 incompatibility

Browse source 
Looks like this is supposed to operate on native strings so there's no
need to encode or decode at all here

Fixes #30354
This commit is contained in:
Toshio Kuratomi 2017-09-20 21:32:15 -07:00
parent dc8aedb274
commit f66c74915c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/cloud/docker/docker_service.py
View file

@ -520,7 +520,7 @@ def get_redirected_output(path_name):
with open(path_name, 'r') as fd: with open(path_name, 'r') as fd:
for line in fd: for line in fd:
# strip terminal format/color chars # strip terminal format/color chars
new_line = re.sub(r'\x1b\[.+m', '', line.encode('ascii')) new_line = re.sub(r'\x1b\[.+m', '', line)
output.append(new_line) output.append(new_line)
fd.close() fd.close()
os.remove(path_name) os.remove(path_name)