From 2368c2e30b268efee0b874d6135977772cb01d38 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 25 Sep 2018 13:52:38 -0700 Subject: [PATCH] Revert "winrm: add further conditional to using pexect for kerb auth (#45952)" This reverts commit 918d45f95788ac0f821c3ca06f23d0dab1a9ab6b. Unintentionally merged before 2.7.0 final. --- changelogs/fragments/winrm_pexpect.yaml | 2 -- lib/ansible/plugins/connection/winrm.py | 23 +++++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 changelogs/fragments/winrm_pexpect.yaml diff --git a/changelogs/fragments/winrm_pexpect.yaml b/changelogs/fragments/winrm_pexpect.yaml deleted file mode 100644 index 5febee6de66..00000000000 --- a/changelogs/fragments/winrm_pexpect.yaml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: -- winrm - Only use pexpect for auto kerb auth if it is installed and contains the required kwargs - https://github.com/ansible/ansible/issues/43462 diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py index 127c76dfd39..14984372144 100644 --- a/lib/ansible/plugins/connection/winrm.py +++ b/lib/ansible/plugins/connection/winrm.py @@ -97,6 +97,7 @@ DOCUMENTATION = """ """ import base64 +import inspect import os import re import traceback @@ -116,19 +117,12 @@ from ansible.errors import AnsibleFileNotFound from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.six.moves.urllib.parse import urlunsplit from ansible.module_utils._text import to_bytes, to_native, to_text -from ansible.module_utils.six import binary_type, PY3 +from ansible.module_utils.six import binary_type from ansible.plugins.connection import ConnectionBase from ansible.plugins.shell.powershell import leaf_exec from ansible.utils.hashing import secure_hash from ansible.utils.path import makedirs_safe -# getargspec is deprecated in favour of getfullargspec in Python 3 but -# getfullargspec is not available in Python 2 -if PY3: - from inspect import getfullargspec as getargspec -else: - from inspect import getargspec - try: import winrm from winrm import Response @@ -145,18 +139,11 @@ except ImportError as e: HAS_XMLTODICT = False XMLTODICT_IMPORT_ERR = e -HAS_PEXPECT = False try: import pexpect - # echo was added in pexpect 3.3+ which is newer than the RHEL package - # we can only use pexpect for kerb auth if echo is a valid kwarg - # https://github.com/ansible/ansible/issues/43462 - if hasattr(pexpect, 'spawn'): - argspec = getargspec(pexpect.spawn.__init__) - if 'echo' in argspec.args: - HAS_PEXPECT = True + HAS_PEXPECT = True except ImportError as e: - pass + HAS_PEXPECT = False # used to try and parse the hostname and detect if IPv6 is being used try: @@ -256,7 +243,7 @@ class Connection(ConnectionBase): internal_kwarg_mask = set(['self', 'endpoint', 'transport', 'username', 'password', 'scheme', 'path', 'kinit_mode', 'kinit_cmd']) self._winrm_kwargs = dict(username=self._winrm_user, password=self._winrm_pass) - argspec = getargspec(Protocol.__init__) + argspec = inspect.getargspec(Protocol.__init__) supported_winrm_args = set(argspec.args) supported_winrm_args.update(internal_kwarg_mask) passed_winrm_args = set([v.replace('ansible_winrm_', '') for v in self.get_option('_extras')])