ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 03:11:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Assorted python3 fixes for network code. (#18777)

Browse source
This commit is contained in:
Nathaniel Case 2016-12-15 16:25:03 -05:00 • committed by GitHub
parent c49eac5645
commit 7900319fc3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/module_utils/shell.py
View file

@ -31,7 +31,7 @@ except ImportError:
from ansible.module_utils.basic import get_exception
from ansible.module_utils.network import NetworkError
from ansible.module_utils.six.moves import StringIO
from ansible.module_utils.six import BytesIO
from ansible.module_utils._text import to_native
ANSI_RE = [
@ -132,23 +132,23 @@ class Shell(object):
raise ShellError('timeout trying to send command: %s' % self._history[-1])
def receive(self, cmd=None):
recv = StringIO()
recv = BytesIO()
handled = False
while True:
data = self.shell.recv(200)
recv.write(data)
recv.seek(recv.tell() - 200)
recv.seek(recv.tell() - len(data))
window = self.strip(recv.read())
window = self.strip(recv.read().decode('utf8'))
if hasattr(cmd, 'prompt') and not handled:
handled = self.handle_prompt(window, cmd)
try:
if self.find_prompt(window):
resp = self.strip(recv.getvalue())
resp = self.strip(recv.getvalue().decode('utf8'))
return self.sanitize(cmd, resp)
except ShellError:
exc = get_exception()