diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-09 17:38:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-09 17:38:37 +0000 |
| commit | 1f0682bc59be89bc9c6f1d471de81051319b6f8c (patch) | |
| tree | df3f461b4e4d712038d1a2785d70b993cc11856f | |
| parent | 9be8c1a6e20b800884e1d86e7b267d0726ad6e7d (diff) | |
| parent | 5626782fac8e0c16e52146040fcf4053aee2c95e (diff) | |
| download | oslo-messaging-1f0682bc59be89bc9c6f1d471de81051319b6f8c.tar.gz | |
Merge "py37: drop use of 'async' as parameter name"8.0.0
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher_direct.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/client/zmq_senders.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher_direct.py b/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher_direct.py index 6759b34..d1a61e1 100644 --- a/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher_direct.py +++ b/oslo_messaging/_drivers/zmq_driver/client/publishers/dealer/zmq_dealer_publisher_direct.py @@ -57,7 +57,7 @@ class DealerPublisherDirect(zmq_dealer_publisher_base.DealerPublisherBase): """ def __init__(self, conf, matchmaker): - sender = zmq_senders.RequestSenderDirect(conf, async=True) + sender = zmq_senders.RequestSenderDirect(conf, use_async=True) receiver = zmq_receivers.ReceiverDirect(conf) super(DealerPublisherDirect, self).__init__(conf, matchmaker, sender, receiver) diff --git a/oslo_messaging/_drivers/zmq_driver/client/zmq_senders.py b/oslo_messaging/_drivers/zmq_driver/client/zmq_senders.py index 9f3f6d7..6813bf5 100644 --- a/oslo_messaging/_drivers/zmq_driver/client/zmq_senders.py +++ b/oslo_messaging/_drivers/zmq_driver/client/zmq_senders.py @@ -31,9 +31,9 @@ zmq = zmq_async.import_zmq() class SenderBase(object): """Base request/response sending interface.""" - def __init__(self, conf, async=False): + def __init__(self, conf, use_async=False): self.conf = conf - self.async = async + self.use_async = use_async self._lock = threading.Lock() self._send_versions = zmq_version.get_method_versions(self, 'send') @@ -156,7 +156,7 @@ class RequestSenderDirect(RequestSenderBase): "msg_version": request.message_version}) def _send_v_1_0(self, socket, request): - flags = zmq.NOBLOCK if self.async else 0 + flags = zmq.NOBLOCK if self.use_async else 0 socket.send(b'', zmq.SNDMORE | flags) socket.send_string('1.0', zmq.SNDMORE | flags) socket.send(six.b(str(request.msg_type)), zmq.SNDMORE | flags) |