diff options
| author | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-02-26 14:59:04 +0800 |
|---|---|---|
| committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2013-02-26 15:02:33 +0800 |
| commit | bf6c0871d737da802fbb2e70d2481712ac94a1bd (patch) | |
| tree | dc61d4f4f468362c7ded341ce56fcf0689db023b /openstack | |
| parent | 64a1e26a8acd422b7e216a2578d4b140fdf49c80 (diff) | |
| download | oslo-bf6c0871d737da802fbb2e70d2481712ac94a1bd.tar.gz oslo-bf6c0871d737da802fbb2e70d2481712ac94a1bd.tar.xz oslo-bf6c0871d737da802fbb2e70d2481712ac94a1bd.zip | |
Fixes import order nits
Change-Id: I6085bb4a0b990985c8f7a013c89b7d5acafdf312
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/db/api.py | 2 | ||||
| -rw-r--r-- | openstack/common/rpc/amqp.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/openstack/common/db/api.py b/openstack/common/db/api.py index 407790d..5603bb5 100644 --- a/openstack/common/db/api.py +++ b/openstack/common/db/api.py @@ -39,8 +39,8 @@ import functools from oslo.config import cfg -from openstack.common import lockutils from openstack.common import importutils +from openstack.common import lockutils db_opts = [ diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py index 2ae7af2..128c7d7 100644 --- a/openstack/common/rpc/amqp.py +++ b/openstack/common/rpc/amqp.py @@ -32,19 +32,20 @@ import uuid from eventlet import greenpool from eventlet import pools -from eventlet import semaphore from eventlet import queue - +from eventlet import semaphore # TODO(pekowsk): Remove import cfg and below comment in Havana. # This import should no longer be needed when the amqp_rpc_single_reply_queue # option is removed. from oslo.config import cfg + from openstack.common import excutils from openstack.common.gettextutils import _ from openstack.common import local from openstack.common import log as logging from openstack.common.rpc import common as rpc_common + # TODO(pekowski): Remove this option in Havana. amqp_opts = [ cfg.BoolOpt('amqp_rpc_single_reply_queue', |