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

Clean code, fd.close not required since open as fd if used; remove get_redirected_output from cleanup_redirection_tempfiles since output is not used

Browse source 
(cherry picked from commit ef51f00bbc9f24485915040b863c9d034d3c272c)
This commit is contained in:
Sebastien Boyron 2017-09-21 14:42:40 +02:00 committed by Toshio Kuratomi
parent f66c74915c
commit 901bc2cffe
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -511,8 +511,8 @@ def make_redirection_tempfiles():
def cleanup_redirection_tempfiles(out_name, err_name):
get_redirected_output(out_name)
get_redirected_output(err_name)
for i in [out_name, err_name]:
os.remove(i)
def get_redirected_output(path_name):
@ -522,7 +522,6 @@ def get_redirected_output(path_name):
# strip terminal format/color chars
new_line = re.sub(r'\x1b\[.+m', '', line)
output.append(new_line)
fd.close()
os.remove(path_name)
return output