Rename channel to client

A bit more clear since there are client and server-side classes
This commit is contained in:
Thomas Jackson 2015-01-19 09:25:38 -08:00
parent 1ffac59056
commit 5ae95fff58
5 changed files with 6 additions and 6 deletions

View File

@ -5,7 +5,7 @@ Encapsulate the different transports available to Salt. Currently this is only
from __future__ import absolute_import
# for backwards compatibility
from salt.transport.channel import ReqChannel
from salt.transport.client import ReqChannel
class Channel(ReqChannel):
@staticmethod

View File

@ -1,4 +1,4 @@
from salt.transport.channel import ReqChannel
from salt.transport.client import ReqChannel
class LocalChannel(ReqChannel):

View File

@ -16,7 +16,7 @@ import logging
from collections import defaultdict
from salt.utils import kinds
from salt.transport.channel import ReqChannel
from salt.transport.client import ReqChannel
log = logging.getLogger(__name__)

View File

@ -18,13 +18,13 @@ import salt.payload
import logging
from collections import defaultdict
import salt.transport.channel
import salt.transport.client
import zmq
log = logging.getLogger(__name__)
class ZeroMQReqChannel(salt.transport.channel.ReqChannel):
class ZeroMQReqChannel(salt.transport.client.ReqChannel):
'''
Encapsulate sending routines to ZeroMQ.
@ -132,7 +132,7 @@ class ZeroMQReqChannel(salt.transport.channel.ReqChannel):
return self._crypted_transfer(load, tries, timeout)
class ZeroMQPubChannel(salt.transport.channel.PubChannel):
class ZeroMQPubChannel(salt.transport.client.PubChannel):
def __init__(self,
opts,
**kwargs):