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

Stop using the deprecated salt.transport.client imports.

Browse source 
Fixes #64186

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-05-02 17:26:51 +01:00 • committed by Pedro Algarvio
parent fc54cafc48
commit 87074deea0
7 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/64186.fixed.md Normal file
View file

@ -0,0 +1 @@
Stop using the deprecated `salt.transport.client` imports.

8
salt/minion.py
View file

@ -1363,7 +1363,7 @@ class Minion(MinionBase):
)
# a long-running req channel
self.req_channel = salt.transport.client.AsyncReqChannel.factory(
self.req_channel = salt.channel.client.AsyncReqChannel.factory(
self.opts, io_loop=self.io_loop
)
@ -2817,10 +2817,8 @@ class Minion(MinionBase):
self.opts["master"],
)
self.req_channel = (
salt.transport.client.AsyncReqChannel.factory(
self.opts, io_loop=self.io_loop
)
self.req_channel = salt.channel.client.AsyncReqChannel.factory(
self.opts, io_loop=self.io_loop
)
# put the current schedule into the new loaders

2
salt/transport/client.py
View file

@ -13,8 +13,6 @@ from salt.utils.versions import warn_until
log = logging.getLogger(__name__)
# XXX: Add depreication warnings to start using salt.channel.client
class ReqChannel:
"""

1
salt/transport/ipc.py
View file

@ -13,7 +13,6 @@ import salt.ext.tornado.concurrent
import salt.ext.tornado.gen
import salt.ext.tornado.ioloop
import salt.ext.tornado.netutil
import salt.transport.client
import salt.transport.frame
import salt.utils.msgpack
from salt.ext.tornado.ioloop import IOLoop

2
salt/transport/local.py
View file

@ -1,7 +1,7 @@
import logging
import salt.utils.files
from salt.transport.client import ReqChannel
from salt.channel.client import ReqChannel
log = logging.getLogger(__name__)

2
salt/transport/tcp.py
View file

@ -25,10 +25,8 @@ import salt.ext.tornado.tcpclient
import salt.ext.tornado.tcpserver
import salt.master
import salt.payload
import salt.transport.client
import salt.transport.frame
import salt.transport.ipc
import salt.transport.server
import salt.utils.asynchronous
import salt.utils.files
import salt.utils.msgpack

2
tests/pytests/functional/transport/server/test_req_channel.py
View file

@ -11,8 +11,6 @@ import salt.config
import salt.exceptions
import salt.ext.tornado.gen
import salt.master
import salt.transport.client
import salt.transport.server
import salt.utils.platform
import salt.utils.process
import salt.utils.stringutils