mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
fix pre-commit
This commit is contained in:
parent
5c94ad9dea
commit
92e09bfe69
5 changed files with 11 additions and 4 deletions
|
@ -37,6 +37,8 @@ from salt.exceptions import (
|
|||
# Import 3rd-party libs
|
||||
from salt.log import LOG_LEVELS
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -429,6 +429,9 @@ def salt_cp():
|
|||
client.run()
|
||||
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
|
||||
def salt_call():
|
||||
"""
|
||||
Directly call a salt command in the modules, does not require a running
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
Encapsulate the different transports available to Salt.
|
||||
"""
|
||||
# Import Python libs
|
||||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
|
||||
import logging
|
||||
|
||||
|
@ -16,6 +14,8 @@ from salt.ext.six.moves import range
|
|||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
x = "fix pre"
|
||||
|
||||
|
||||
def iter_transport_opts(opts):
|
||||
"""
|
||||
|
@ -23,7 +23,7 @@ def iter_transport_opts(opts):
|
|||
"""
|
||||
transports = set()
|
||||
|
||||
for transport, opts_overrides in six.iteritems(opts.get("transport_opts", {})):
|
||||
for transport, opts_overrides in opts.get("transport_opts", {}).items():
|
||||
t_opts = dict(opts)
|
||||
t_opts.update(opts_overrides)
|
||||
t_opts["transport"] = transport
|
||||
|
@ -34,7 +34,7 @@ def iter_transport_opts(opts):
|
|||
yield opts["transport"], opts
|
||||
|
||||
|
||||
class MessageClientPool(object):
|
||||
class MessageClientPool:
|
||||
def __init__(self, tgt, opts, args=None, kwargs=None):
|
||||
sock_pool_size = opts["sock_pool_size"] if "sock_pool_size" in opts else 1
|
||||
if sock_pool_size < 1:
|
||||
|
|
|
@ -51,6 +51,7 @@ from salt.utils.zeromq import (
|
|||
zmq,
|
||||
)
|
||||
|
||||
x = "fix pre"
|
||||
try:
|
||||
import zmq.utils.monitor
|
||||
|
||||
|
|
|
@ -6,5 +6,6 @@ minion to run.
|
|||
|
||||
from salt.scripts import salt_call
|
||||
|
||||
x = "fix pre"
|
||||
if __name__ == "__main__":
|
||||
salt_call()
|
||||
|
|
Loading…
Add table
Reference in a new issue