From f3714c88a6c748145066f335e9fb8109ed9c748d Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 6 Oct 2014 15:05:52 -0500 Subject: [PATCH] Revert "atfork import warning should be suppressed when system_warnings = False" This reverts commit a175168686abedaad88051aedc2dab3d164ba792. --- lib/ansible/runner/__init__.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 0f11e8ba44..19c90ba529 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -32,7 +32,6 @@ import pipes import jinja2 import subprocess import getpass -import warnings import ansible.constants as C import ansible.inventory @@ -50,7 +49,6 @@ from ansible.module_common import ModuleReplacer from ansible.module_utils.splitter import split_args, unquote from ansible.cache import FactCache from ansible.utils import update_hash -from ansible.utils.display_functions import * module_replacer = ModuleReplacer(strip_comments=False) @@ -61,26 +59,10 @@ except ImportError: HAS_ATFORK=True try: - # some versions of pycrypto may not have this? - from Crypto.pct_warnings import PowmInsecureWarning + from Crypto.Random import atfork except ImportError: - PowmInsecureWarning = RuntimeWarning + HAS_ATFORK=False -with warnings.catch_warnings(record=True) as warning_handler: - warnings.simplefilter("error", PowmInsecureWarning) - try: - from Crypto.Random import atfork - except PowmInsecureWarning: - system_warning( - "The version of gmp you have installed has a known issue regarding " + \ - "timing vulnerabilities when used with pycrypto. " + \ - "If possible, you should update it (ie. yum update gmp)." - ) - warnings.resetwarnings() - warnings.simplefilter("ignore") - HAS_ATFORK=False - except ImportError: - HAS_ATFORK=False multiprocessing_runner = None OUTPUT_LOCKFILE = tempfile.TemporaryFile()