openstack/oslo.messaging
Code Issues Proposed changes

Adjust imports in rabbit/qpid drivers

Browse Source 
Some modules are in oslo.messaging.openstack.common and others are in
oslo.messaging._drivers.

Change-Id: I3581eff3427858c8f46673e4a3c376367c626bb3
This commit is contained in:
Mark McLoughlin 2013-07-23 17:16:22 +01:00
parent 1c739eb89f
commit 04dd4e1773
4 changed files with 23 additions and 23 deletions

10
oslo/messaging/_drivers/amqp.py

@ -36,11 +36,11 @@ from eventlet import queue
from eventlet import semaphore from eventlet import semaphore
from oslo.config import cfg from oslo.config import cfg
from openstack.common import excutils from oslo.messaging._drivers import common as rpc_common
from openstack.common.gettextutils import _ # noqa from oslo.messaging.openstack.common import excutils
from openstack.common import local from oslo.messaging.openstack.common.gettextutils import _ # noqa
from openstack.common import log as logging from oslo.messaging.openstack.common import local
from openstack.common.rpc import common as rpc_common from oslo.messaging.openstack.common import log as logging
amqp_opts = [ amqp_opts = [

10
oslo/messaging/_drivers/common.py

@ -24,11 +24,11 @@ import traceback
from oslo.config import cfg from oslo.config import cfg
import six import six
from openstack.common.gettextutils import _ # noqa from oslo.messaging.openstack.common.gettextutils import _ # noqa
from openstack.common import importutils from oslo.messaging.openstack.common import importutils
from openstack.common import jsonutils from oslo.messaging.openstack.common import jsonutils
from openstack.common import local from oslo.messaging.openstack.common import local
from openstack.common import log as logging from oslo.messaging.openstack.common import log as logging
CONF = cfg.CONF CONF = cfg.CONF

14
oslo/messaging/_drivers/impl_qpid.py

@ -24,13 +24,13 @@ import eventlet
import greenlet import greenlet
from oslo.config import cfg from oslo.config import cfg
from openstack.common import excutils from oslo.messaging._drivers.rpc import amqp as rpc_amqp
from openstack.common.gettextutils import _ # noqa from oslo.messaging._drivers.rpc import common as rpc_common
from openstack.common import importutils from oslo.messaging.openstack.common import excutils
from openstack.common import jsonutils from oslo.messaging.openstack.common.gettextutils import _ # noqa
from openstack.common import log as logging from oslo.messaging.openstack.common import importutils
from openstack.common.rpc import amqp as rpc_amqp from oslo.messaging.openstack.common import jsonutils
from openstack.common.rpc import common as rpc_common from oslo.messaging.openstack.common import log as logging
qpid_codec = importutils.try_import("qpid.codec010") qpid_codec = importutils.try_import("qpid.codec010")
qpid_messaging = importutils.try_import("qpid.messaging") qpid_messaging = importutils.try_import("qpid.messaging")

12
oslo/messaging/_drivers/impl_rabbit.py

@ -29,12 +29,12 @@ import kombu.entity
import kombu.messaging import kombu.messaging
from oslo.config import cfg from oslo.config import cfg
from openstack.common import excutils from oslo.messaging._drivers import amqp as rpc_amqp
from openstack.common.gettextutils import _ # noqa from oslo.messaging._drivers import common as rpc_common
from openstack.common import network_utils from oslo.messaging.openstack.common import excutils
from openstack.common.rpc import amqp as rpc_amqp from oslo.messaging.openstack.common.gettextutils import _ # noqa
from openstack.common.rpc import common as rpc_common from oslo.messaging.openstack.common import network_utils
from openstack.common import sslutils from oslo.messaging.openstack.common import sslutils
kombu_opts = [ kombu_opts = [
cfg.StrOpt('kombu_ssl_version', cfg.StrOpt('kombu_ssl_version',