From e2a353cfb057a23fe6e53a0600647b0d64559512 Mon Sep 17 00:00:00 2001 From: Bo Maryniuk Date: Tue, 13 Feb 2018 14:20:46 +0100 Subject: [PATCH] Remove unnecessary ZMQ extra-check for cache utils --- salt/utils/cache.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/salt/utils/cache.py b/salt/utils/cache.py index 647fe02c76..91bdfd7fa5 100644 --- a/salt/utils/cache.py +++ b/salt/utils/cache.py @@ -18,11 +18,7 @@ import salt.utils.dictupdate # Import third party libs from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin -try: - import zmq - HAS_ZMQ = True -except ImportError: - HAS_ZMQ = False +from salt.utils.zeromq import zmq log = logging.getLogger(__name__)