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

Wrap crypto.hash imports with try/except

Browse source
This commit is contained in:
James Tanner 2014-03-10 19:43:39 -04:00
parent 0f962dba14
commit 6740a1f342
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/vault.py
View file

@ -30,7 +30,11 @@ from binascii import hexlify
from binascii import unhexlify from binascii import unhexlify
from ansible import constants as C from ansible import constants as C
try:
from Crypto.Hash import SHA256, HMAC from Crypto.Hash import SHA256, HMAC
HAS_HASH = True
except ImportError:
HAS_HASH = False
# Counter import fails for 2.0.1, requires >= 2.6.1 from pip # Counter import fails for 2.0.1, requires >= 2.6.1 from pip
try: try: