Merge "Replace lambda method _"

7 files changed, 6 insertions, 21 deletions

diff --git a/oslo/messaging/_drivers/amqp.py b/oslo/messaging/_drivers/amqp.py
index f008379..9292a11 100644
--- a/oslo/messaging/_drivers/amqp.py
+++ b/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,
diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py
index 83f634b..9ef9410 100644
--- a/oslo/messaging/_drivers/common.py
+++ b/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'
diff --git a/oslo/messaging/_drivers/impl_qpid.py b/oslo/messaging/_drivers/impl_qpid.py
index 623ede9..0824597 100644
--- a/oslo/messaging/_drivers/impl_qpid.py
+++ b/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")
diff --git a/oslo/messaging/_drivers/impl_rabbit.py b/oslo/messaging/_drivers/impl_rabbit.py
index 67de80e..e7119a1 100644
--- a/oslo/messaging/_drivers/impl_rabbit.py
+++ b/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='',
diff --git a/oslo/messaging/_drivers/impl_zmq.py b/oslo/messaging/_drivers/impl_zmq.py
index e9e3d9d..026b303 100644
--- a/oslo/messaging/_drivers/impl_zmq.py
+++ b/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 (*), '
diff --git a/oslo/messaging/_drivers/matchmaker.py b/oslo/messaging/_drivers/matchmaker.py
index 7aa7956..f80125c 100644
--- a/oslo/messaging/_drivers/matchmaker.py
+++ b/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',
diff --git a/oslo/messaging/_drivers/matchmaker_ring.py b/oslo/messaging/_drivers/matchmaker_ring.py
index 40db24b..6ef69ac 100644
--- a/oslo/messaging/_drivers/matchmaker_ring.py
+++ b/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