From f1bda19dea74d8dc0a2d4114cc272831f2f1052e Mon Sep 17 00:00:00 2001 From: Ganesh Nalawade Date: Mon, 25 Dec 2017 18:15:25 +0530 Subject: [PATCH] Fixes get_prompt() issue for network platforms using cliconf plugins (#34221) Fixes #34220 --- lib/ansible/plugins/cliconf/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/plugins/cliconf/__init__.py b/lib/ansible/plugins/cliconf/__init__.py index e140bdab159..44696ef0d4b 100644 --- a/lib/ansible/plugins/cliconf/__init__.py +++ b/lib/ansible/plugins/cliconf/__init__.py @@ -25,7 +25,7 @@ from abc import ABCMeta, abstractmethod from functools import wraps from ansible.errors import AnsibleError, AnsibleConnectionFailure -from ansible.module_utils._text import to_bytes +from ansible.module_utils._text import to_bytes, to_text from ansible.module_utils.six import with_metaclass try: @@ -45,8 +45,8 @@ except ImportError: def enable_mode(func): @wraps(func) def wrapped(self, *args, **kwargs): - prompt = self.get_prompt() - if not str(prompt).strip().endswith('#'): + prompt = self._connection.get_prompt() + if not to_text(prompt, errors='surrogate_or_strict').strip().endswith('#'): raise AnsibleError('operation requires privilege escalation') return func(self, *args, **kwargs) return wrapped