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

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
Show stats 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()

4
lib/ansible/plugins/action/net_config.py
View file

@ -23,10 +23,10 @@ import os
import re
import time
import glob
import urlparse
from ansible.plugins.action import ActionBase
from ansible.module_utils._text import to_text
from ansible.module_utils.six.moves.urllib.parse import urlsplit
PRIVATE_KEYS_RE = re.compile('__.+__')
@ -87,7 +87,7 @@ class ActionModule(ActionBase):
src = self._task.args.get('src')
working_path = self._get_working_path()
if os.path.isabs(src) or urlparse.urlsplit('src').scheme:
if os.path.isabs(src) or urlsplit('src').scheme:
source = src
else:
source = self._loader.path_dwim_relative(working_path, 'templates', src)