diff --git a/salt/scripts.py b/salt/scripts.py index 4ed8c9023579..38adbdf20e14 100644 --- a/salt/scripts.py +++ b/salt/scripts.py @@ -441,11 +441,6 @@ def salt_call(): """ import salt.cli.call - try: - from salt.transport import zeromq - except ImportError: - zeromq = None - if "" in sys.path: sys.path.remove("") client = salt.cli.call.SaltCall() diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py index a51eca908ef0..ed8f7148369f 100644 --- a/salt/transport/tcp.py +++ b/salt/transport/tcp.py @@ -13,7 +13,6 @@ import time import traceback import urllib.parse -import weakref import salt.crypt import salt.exceptions @@ -211,8 +210,6 @@ class AsyncTCPReqChannel(salt.transport.client.ReqChannel): "close", ] - - @classmethod def __init__(self, opts, **kwargs): self.opts = dict(opts) diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index a0a56b326575..375fcd1fd628 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -1,7 +1,6 @@ """ Zeromq transport classes """ -import copy import errno import hashlib import logging @@ -9,7 +8,6 @@ import signal import sys import threading -import weakref from random import randint import salt.auth