diff options
Diffstat (limited to 'commands/expect.py')
| -rw-r--r-- | commands/expect.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/commands/expect.py b/commands/expect.py index 355f2cff..c6f70e75 100644 --- a/commands/expect.py +++ b/commands/expect.py @@ -195,7 +195,8 @@ def main(): # Use pexpect.runu in pexpect>=3.3,<4 out, rc = pexpect.runu(args, timeout=timeout, withexitstatus=True, events=events, cwd=chdir, echo=echo) - except (TypeError, AttributeError), e: + except (TypeError, AttributeError): + e = get_exception() # This should catch all insufficient versions of pexpect # We deem them insufficient for their lack of ability to specify # to not echo responses via the run/runu functions, which would @@ -203,7 +204,8 @@ def main(): module.fail_json(msg='Insufficient version of pexpect installed ' '(%s), this module requires pexpect>=3.3. ' 'Error was %s' % (pexpect.__version__, e)) - except pexpect.ExceptionPexpect, e: + except pexpect.ExceptionPexpect: + e = get_exception() module.fail_json(msg='%s' % e) endd = datetime.datetime.now() @@ -230,5 +232,6 @@ def main(): # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.pycompat24 import get_exception main() |