diff options
Diffstat (limited to 'lib/ansible/plugins/terminal/sros.py')
| -rw-r--r-- | lib/ansible/plugins/terminal/sros.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ansible/plugins/terminal/sros.py b/lib/ansible/plugins/terminal/sros.py index 07d8f37b86..e7153c13c6 100644 --- a/lib/ansible/plugins/terminal/sros.py +++ b/lib/ansible/plugins/terminal/sros.py @@ -20,7 +20,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type import re -import json from ansible.plugins.terminal import TerminalBase from ansible.errors import AnsibleConnectionFailure @@ -29,16 +28,16 @@ from ansible.errors import AnsibleConnectionFailure class TerminalModule(TerminalBase): terminal_stdout_re = [ - re.compile(r"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), - re.compile(r"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$") + re.compile(br"[\r\n]?[\w+\-\.:\/\[\]]+(?:\([^\)]+\)){,3}(?:>|#) ?$"), + re.compile(br"\[\w+\@[\w\-\.]+(?: [^\]])\] ?[>#\$] ?$") ] terminal_stderr_re = [ - re.compile(r"Error:"), + re.compile(br"Error:"), ] def on_open_shell(self): try: - self._exec_cli_command('environment no more') + self._exec_cli_command(b'environment no more') except AnsibleConnectionFailure: raise AnsibleConnectionFailure('unable to set terminal parameters') |