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

Fix ansible-pull on python3

Browse source 
On python3, we can't write bytes directly to sys.stdout.
This commit is contained in:
Toshio Kuratomi 2016-10-17 15:58:23 -07:00
parent fd14048d46
commit 60acfd1e87
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/utils/cmd_functions.py
View file

@ -24,7 +24,7 @@ import shlex
import subprocess import subprocess
import select import select
from ansible.compat.six import PY2 from ansible.compat.six import PY2, PY3
from ansible.module_utils._text import to_bytes from ansible.module_utils._text import to_bytes
def run_cmd(cmd, live=False, readsize=10): def run_cmd(cmd, live=False, readsize=10):
@ -51,7 +51,11 @@ def run_cmd(cmd, live=False, readsize=10):
if p.stdout in rfd: if p.stdout in rfd:
dat = os.read(p.stdout.fileno(), readsize) dat = os.read(p.stdout.fileno(), readsize)
if live: if live:
sys.stdout.write(dat) # On python3, stdout has a codec to go from text type to bytes
if PY3:
sys.stdout.buffer.write(dat)
else:
sys.stdout.write(dat)
stdout += dat stdout += dat
if dat == b'': if dat == b'':
rpipes.remove(p.stdout) rpipes.remove(p.stdout)
@ -59,7 +63,11 @@ def run_cmd(cmd, live=False, readsize=10):
dat = os.read(p.stderr.fileno(), readsize) dat = os.read(p.stderr.fileno(), readsize)
stderr += dat stderr += dat
if live: if live:
sys.stdout.write(dat) # On python3, stdout has a codec to go from text type to bytes
if PY3:
sys.stdout.buffer.write(dat)
else:
sys.stdout.write(dat)
if dat == b'': if dat == b'':
rpipes.remove(p.stderr) rpipes.remove(p.stderr)
# only break out if we've emptied the pipes, or there is nothing to # only break out if we've emptied the pipes, or there is nothing to

3
test/utils/shippable/python3-test-target-blacklist.txt
View file

@ -1,3 +0,0 @@
s/ pull_run / /
s/ pull_no_127 / /
s/ pull_limit_inventory / /