mirror of
https://github.com/saltstack/salt.git
synced 2025-04-10 06:41:40 +00:00
fix pre
This commit is contained in:
parent
92e09bfe69
commit
b234fda95b
5 changed files with 2 additions and 7 deletions
|
@ -37,8 +37,6 @@ from salt.exceptions import (
|
|||
# Import 3rd-party libs
|
||||
from salt.log import LOG_LEVELS
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -429,9 +429,6 @@ def salt_cp():
|
|||
client.run()
|
||||
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
|
||||
def salt_call():
|
||||
"""
|
||||
Directly call a salt command in the modules, does not require a running
|
||||
|
|
|
@ -51,7 +51,6 @@ from salt.utils.zeromq import (
|
|||
zmq,
|
||||
)
|
||||
|
||||
x = "fix pre"
|
||||
try:
|
||||
import zmq.utils.monitor
|
||||
|
||||
|
|
|
@ -6,6 +6,5 @@ minion to run.
|
|||
|
||||
from salt.scripts import salt_call
|
||||
|
||||
x = "fix pre"
|
||||
if __name__ == "__main__":
|
||||
salt_call()
|
||||
|
|
|
@ -35,6 +35,8 @@ from tests.unit.transport.mixins import (
|
|||
run_loop_in_thread,
|
||||
)
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
# support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
|
||||
if not hasattr(zmq.eventloop.ioloop, "ZMQIOLoop"):
|
||||
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
|
||||
|
|
Loading…
Add table
Reference in a new issue