From 7aa7a880c5b40d19b6bd31a7c4dc8bd0383d75da Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Thu, 24 Dec 2015 13:13:28 +0800 Subject: [PATCH] Trivial: Remove unused logging import Change-Id: Ic8cb2b5a45ac0e49c34c3903a52a3d22a7bcb45d --- oslo_messaging/_drivers/amqp.py | 2 -- oslo_messaging/_drivers/impl_zmq.py | 2 -- oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py | 3 --- oslo_messaging/_drivers/zmq_driver/matchmaker/base.py | 4 ---- oslo_messaging/_drivers/zmq_driver/poller/green_poller.py | 3 --- oslo_messaging/_drivers/zmq_driver/zmq_async.py | 3 --- oslo_messaging/_executors/impl_eventlet.py | 4 ---- oslo_messaging/_utils.py | 3 --- oslo_messaging/tests/drivers/zmq/test_impl_zmq.py | 3 --- oslo_messaging/tests/drivers/zmq/test_pub_sub.py | 2 -- 10 files changed, 29 deletions(-) diff --git a/oslo_messaging/_drivers/amqp.py b/oslo_messaging/_drivers/amqp.py index 06a59f84..2fe9c17f 100644 --- a/oslo_messaging/_drivers/amqp.py +++ b/oslo_messaging/_drivers/amqp.py @@ -24,7 +24,6 @@ uses AMQP, but is deprecated and predates this code. """ import collections -import logging import uuid from oslo_config import cfg @@ -51,7 +50,6 @@ amqp_opts = [ ] UNIQUE_ID = '_unique_id' -LOG = logging.getLogger(__name__) class RpcContext(rpc_common.CommonRpcContext): diff --git a/oslo_messaging/_drivers/impl_zmq.py b/oslo_messaging/_drivers/impl_zmq.py index 5eb3fdc3..018face8 100644 --- a/oslo_messaging/_drivers/impl_zmq.py +++ b/oslo_messaging/_drivers/impl_zmq.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import os import socket import threading @@ -29,7 +28,6 @@ from oslo_messaging._executors import impl_pooledexecutor from oslo_messaging._i18n import _LE -LOG = logging.getLogger(__name__) RPCException = rpc_common.RPCException zmq_opts = [ diff --git a/oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py b/oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py index c309474f..d5c3c29d 100644 --- a/oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py +++ b/oslo_messaging/_drivers/zmq_driver/broker/zmq_base_proxy.py @@ -13,14 +13,11 @@ # under the License. import abc -import logging import six from oslo_messaging._drivers.zmq_driver import zmq_async -LOG = logging.getLogger(__name__) - @six.add_metaclass(abc.ABCMeta) class BaseProxy(object): diff --git a/oslo_messaging/_drivers/zmq_driver/matchmaker/base.py b/oslo_messaging/_drivers/zmq_driver/matchmaker/base.py index 75f6a731..8e23d7af 100644 --- a/oslo_messaging/_drivers/zmq_driver/matchmaker/base.py +++ b/oslo_messaging/_drivers/zmq_driver/matchmaker/base.py @@ -13,16 +13,12 @@ import abc import collections -import logging import six from oslo_messaging._drivers.zmq_driver import zmq_address -LOG = logging.getLogger(__name__) - - @six.add_metaclass(abc.ABCMeta) class MatchMakerBase(object): diff --git a/oslo_messaging/_drivers/zmq_driver/poller/green_poller.py b/oslo_messaging/_drivers/zmq_driver/poller/green_poller.py index 7ba3b80f..e17879b7 100644 --- a/oslo_messaging/_drivers/zmq_driver/poller/green_poller.py +++ b/oslo_messaging/_drivers/zmq_driver/poller/green_poller.py @@ -12,15 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import threading import eventlet from oslo_messaging._drivers.zmq_driver import zmq_poller -LOG = logging.getLogger(__name__) - class GreenPoller(zmq_poller.ZmqPoller): diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_async.py b/oslo_messaging/_drivers/zmq_driver/zmq_async.py index 6819a7e6..a8c81795 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_async.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_async.py @@ -12,12 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from oslo_messaging._i18n import _ from oslo_utils import importutils -LOG = logging.getLogger(__name__) # Map zmq_concurrency config option names to the actual module name. ZMQ_MODULES = { diff --git a/oslo_messaging/_executors/impl_eventlet.py b/oslo_messaging/_executors/impl_eventlet.py index 3786eb9e..a73ed15c 100644 --- a/oslo_messaging/_executors/impl_eventlet.py +++ b/oslo_messaging/_executors/impl_eventlet.py @@ -13,16 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from eventlet.green import threading as greenthreading import futurist from oslo_messaging._executors import impl_pooledexecutor from oslo_utils import eventletutils -LOG = logging.getLogger(__name__) - class EventletExecutor(impl_pooledexecutor.PooledExecutor): """A message executor which integrates with eventlet. diff --git a/oslo_messaging/_utils.py b/oslo_messaging/_utils.py index 021fea26..e0025e68 100644 --- a/oslo_messaging/_utils.py +++ b/oslo_messaging/_utils.py @@ -13,11 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import threading -LOG = logging.getLogger(__name__) - def version_is_compatible(imp_version, version): """Determine whether versions are compatible. diff --git a/oslo_messaging/tests/drivers/zmq/test_impl_zmq.py b/oslo_messaging/tests/drivers/zmq/test_impl_zmq.py index 5f86679b..78ec5e62 100644 --- a/oslo_messaging/tests/drivers/zmq/test_impl_zmq.py +++ b/oslo_messaging/tests/drivers/zmq/test_impl_zmq.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - import fixtures import testtools @@ -24,7 +22,6 @@ from oslo_messaging._drivers.zmq_driver import zmq_socket from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests.drivers.zmq import zmq_common -LOG = logging.getLogger(__name__) zmq = zmq_async.import_zmq() diff --git a/oslo_messaging/tests/drivers/zmq/test_pub_sub.py b/oslo_messaging/tests/drivers/zmq/test_pub_sub.py index 8e17fb85..5c06c933 100644 --- a/oslo_messaging/tests/drivers/zmq/test_pub_sub.py +++ b/oslo_messaging/tests/drivers/zmq/test_pub_sub.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import pickle import time @@ -31,7 +30,6 @@ from oslo_messaging._drivers.zmq_driver.client.publishers \ from oslo_messaging.tests import utils as test_utils from oslo_messaging.tests.drivers.zmq import zmq_common -LOG = logging.getLogger(__name__) zmq = zmq_async.import_zmq()