saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix #23695

Browse source 
- require pycrypto >= 2.1.0 in requirements/zeromq.txt
- remove old workaround for pycrypto < 2.1 from salt/cloud/__init__.py
This commit is contained in:
Michael Steed 2015-05-14 10:55:59 -06:00
parent fd2d596e63
commit 05a10f8690
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
requirements/zeromq.txt
View file

@ -1,4 +1,4 @@
-r base.txt
pycrypto
pycrypto >= 2.1.0
pyzmq >= 2.2.0

8
salt/cloud/__init__.py
View file

@ -36,6 +36,7 @@ from salt.ext.six import string_types
from salt.template import compile_template
# Import third party libs
import Crypto.Random
import yaml
import salt.ext.six as six
from salt.ext.six.moves import input # pylint: disable=import-error,redefined-builtin
@ -2231,12 +2232,7 @@ def run_parallel_map_providers_query(data, queue=None):
This function will be called from another process when building the
providers map.
'''
try:
import Crypto.Random # pylint: disable=E0611
Crypto.Random.atfork()
except ImportError:
# PyCrypto version < 2.1
pass
Crypto.Random.atfork()
cloud = Cloud(data['opts'])
try: