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

Do not look for a paramiko compat package anymore (#55106)

Browse source
This commit is contained in:
Toshio Kuratomi 2019-04-10 11:51:53 -07:00 committed by Sam Doran
parent a290cb4a35
commit 04e5c550a8
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/paramiko-optional.yaml Normal file
View file

@ -0,0 +1,3 @@
---
minor_changes:
- paramiko is now optional. There is no compat package on certain platforms to worry about.

7
lib/ansible/module_utils/compat/paramiko.py
View file

@ -10,10 +10,5 @@ PARAMIKO_IMPORT_ERR = None
paramiko = None paramiko = None
try: try:
import paramiko import paramiko
except ImportError: except (ImportError, AttributeError) as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
try:
import ansible_paramiko as paramiko
except (ImportError, AttributeError) as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
PARAMIKO_IMPORT_ERR = err
except AttributeError as err: # paramiko and gssapi are incompatible and raise AttributeError not ImportError
PARAMIKO_IMPORT_ERR = err PARAMIKO_IMPORT_ERR = err