Browse Source

Replace lambda method _

Instead of the lambda method _ the method should be imported
from oslo.messaging.openstack.common.gettextutils.

Change-Id: I373337cc1227b0d7b7bf93603b53a64de83721a9
changes/02/111702/1
Christian Berendt 7 years ago
parent
commit
7fdeddaa3b
  1. 3
      oslo/messaging/_drivers/amqp.py
  2. 4
      oslo/messaging/_drivers/common.py
  3. 4
      oslo/messaging/_drivers/impl_qpid.py
  4. 4
      oslo/messaging/_drivers/impl_rabbit.py
  5. 4
      oslo/messaging/_drivers/impl_zmq.py
  6. 4
      oslo/messaging/_drivers/matchmaker.py
  7. 4
      oslo/messaging/_drivers/matchmaker_ring.py

3
oslo/messaging/_drivers/amqp.py

@ -34,9 +34,6 @@ from oslo.config import cfg
from oslo.messaging._drivers import common as rpc_common
from oslo.messaging._drivers import pool
# FIXME(markmc): remove this
_ = lambda s: s
amqp_opts = [
cfg.BoolOpt('amqp_durable_queues',
default=False,

4
oslo/messaging/_drivers/common.py

@ -24,12 +24,10 @@ import six
from oslo import messaging
from oslo.messaging import _utils as utils
from oslo.messaging.openstack.common.gettextutils import _
from oslo.messaging.openstack.common import importutils
from oslo.messaging.openstack.common import jsonutils
# FIXME(markmc): remove this
_ = lambda s: s
LOG = logging.getLogger(__name__)
_EXCEPTIONS_MODULE = 'exceptions' if six.PY2 else 'builtins'

4
oslo/messaging/_drivers/impl_qpid.py

@ -26,13 +26,11 @@ from oslo.messaging._drivers import amqp as rpc_amqp
from oslo.messaging._drivers import amqpdriver
from oslo.messaging._drivers import common as rpc_common
from oslo.messaging import exceptions
from oslo.messaging.openstack.common.gettextutils import _
from oslo.messaging.openstack.common import importutils
from oslo.messaging.openstack.common import jsonutils
from oslo.messaging.openstack.common import network_utils
# FIXME(markmc): remove this
_ = lambda s: s
qpid_codec = importutils.try_import("qpid.codec010")
qpid_messaging = importutils.try_import("qpid.messaging")
qpid_exceptions = importutils.try_import("qpid.messaging.exceptions")

4
oslo/messaging/_drivers/impl_rabbit.py

@ -32,11 +32,9 @@ from oslo.messaging._drivers import amqp as rpc_amqp
from oslo.messaging._drivers import amqpdriver
from oslo.messaging._drivers import common as rpc_common
from oslo.messaging import exceptions
from oslo.messaging.openstack.common.gettextutils import _
from oslo.messaging.openstack.common import network_utils
# FIXME(markmc): remove this
_ = lambda s: s
rabbit_opts = [
cfg.StrOpt('kombu_ssl_version',
default='',

4
oslo/messaging/_drivers/impl_zmq.py

@ -33,6 +33,7 @@ from oslo.messaging._drivers import base
from oslo.messaging._drivers import common as rpc_common
from oslo.messaging._executors import impl_eventlet # FIXME(markmc)
from oslo.messaging.openstack.common import excutils
from oslo.messaging.openstack.common.gettextutils import _
from oslo.messaging.openstack.common import importutils
from oslo.messaging.openstack.common import jsonutils
@ -44,9 +45,6 @@ Timeout = eventlet.timeout.Timeout
LOG = logging.getLogger(__name__)
RPCException = rpc_common.RPCException
# FIXME(markmc): remove this
_ = lambda s: s
zmq_opts = [
cfg.StrOpt('rpc_zmq_bind_address', default='*',
help='ZeroMQ bind address. Should be a wildcard (*), '

4
oslo/messaging/_drivers/matchmaker.py

@ -22,9 +22,7 @@ import logging
import eventlet
from oslo.config import cfg
# FIXME(markmc): remove this
_ = lambda s: s
from oslo.messaging.openstack.common.gettextutils import _
matchmaker_opts = [
cfg.IntOpt('matchmaker_heartbeat_freq',

4
oslo/messaging/_drivers/matchmaker_ring.py

@ -22,9 +22,7 @@ import logging
from oslo.config import cfg
from oslo.messaging._drivers import matchmaker as mm
# FIXME(markmc): remove this
_ = lambda s: s
from oslo.messaging.openstack.common.gettextutils import _
matchmaker_opts = [
# Matchmaker ring file

Loading…
Cancel
Save