fix #23695

- require pycrypto >= 2.1.0 in requirements/zeromq.txt - remove old workaround for pycrypto < 2.1 from salt/cloud/__init__.py
saltstack · May 14, 2015 · 05a10f8 · 05a10f8
1 parent fd2d596
commit 05a10f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
@@ -1,4 +1,4 @@
 -r base.txt
 
-pycrypto
+pycrypto >= 2.1.0
 pyzmq >= 2.2.0
diff --git a/salt/cloud/__init__.py b/salt/cloud/__init__.py
@@ -36,6 +36,7 @@
 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: