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 pre

Browse source
This commit is contained in:
cmcmarrow 2020-09-28 14:46:37 -06:00 • committed by Daniel Wozniak
parent 92e09bfe69
commit b234fda95b
5 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cli/caller.py
View file

@ -37,8 +37,6 @@ from salt.exceptions import (
# Import 3rd-party libs # Import 3rd-party libs
from salt.log import LOG_LEVELS from salt.log import LOG_LEVELS
x = "fix pre"
log = logging.getLogger(__name__) log = logging.getLogger(__name__)

3
salt/scripts.py
View file

@ -429,9 +429,6 @@ def salt_cp():
client.run() client.run()
x = "fix pre"
def salt_call(): def salt_call():
""" """
Directly call a salt command in the modules, does not require a running Directly call a salt command in the modules, does not require a running

1
salt/transport/zeromq.py
View file

@ -51,7 +51,6 @@ from salt.utils.zeromq import (
zmq, zmq,
) )
x = "fix pre"
try: try:
import zmq.utils.monitor import zmq.utils.monitor

1
scripts/salt-call
View file

@ -6,6 +6,5 @@ minion to run.
from salt.scripts import salt_call from salt.scripts import salt_call
x = "fix pre"
if __name__ == "__main__": if __name__ == "__main__":
salt_call() salt_call()

2
tests/unit/transport/test_zeromq.py
View file

@ -35,6 +35,8 @@ from tests.unit.transport.mixins import (
run_loop_in_thread, run_loop_in_thread,
) )
x = "fix pre"
# support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x # support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
if not hasattr(zmq.eventloop.ioloop, "ZMQIOLoop"): if not hasattr(zmq.eventloop.ioloop, "ZMQIOLoop"):
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop