diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-30 21:40:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-30 21:40:05 +0000 |
| commit | 4747dff07fadf0e3e54c5bcafc5b89b261c37f5d (patch) | |
| tree | 1a9f850480e96cd29404f95d011a6fe1afa25095 /openstack | |
| parent | 4b017d73df7f7046ead3dc21a7642601438113f4 (diff) | |
| parent | b153b563908e91ce1bbce0ab9f019d3fba0b2162 (diff) | |
| download | oslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.tar.gz oslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.tar.xz oslo-4747dff07fadf0e3e54c5bcafc5b89b261c37f5d.zip | |
Merge "Import order clean-up"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/extensions.py | 4 | ||||
| -rw-r--r-- | openstack/common/loopingcall.py | 2 | ||||
| -rw-r--r-- | openstack/common/periodic_task.py | 2 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 2 | ||||
| -rw-r--r-- | openstack/common/service.py | 2 | ||||
| -rw-r--r-- | openstack/common/threadgroup.py | 4 | ||||
| -rw-r--r-- | openstack/common/utils.py | 2 | ||||
| -rw-r--r-- | openstack/common/wsgi.py | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/openstack/common/extensions.py b/openstack/common/extensions.py index 742c4f2..906906d 100644 --- a/openstack/common/extensions.py +++ b/openstack/common/extensions.py @@ -17,12 +17,12 @@ # under the License. import imp +import logging +from lxml import etree import os import routes import webob.dec import webob.exc -import logging -from lxml import etree from openstack.common import exception from openstack.common.gettextutils import _ diff --git a/openstack/common/loopingcall.py b/openstack/common/loopingcall.py index ede3dae..36a533c 100644 --- a/openstack/common/loopingcall.py +++ b/openstack/common/loopingcall.py @@ -22,8 +22,8 @@ import sys from eventlet import event from eventlet import greenthread -from openstack.common import log as logging from openstack.common.gettextutils import _ +from openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/openstack/common/periodic_task.py b/openstack/common/periodic_task.py index 5cf2ade..edfee9b 100644 --- a/openstack/common/periodic_task.py +++ b/openstack/common/periodic_task.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.common import log as logging from openstack.common.gettextutils import _ +from openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index fc34de1..e9118d6 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -31,9 +31,9 @@ import kombu.messaging from openstack.common import cfg from openstack.common.gettextutils import _ +from openstack.common import network_utils from openstack.common.rpc import amqp as rpc_amqp from openstack.common.rpc import common as rpc_common -from openstack.common import network_utils kombu_opts = [ cfg.StrOpt('kombu_ssl_version', diff --git a/openstack/common/service.py b/openstack/common/service.py index 5630035..05060ca 100644 --- a/openstack/common/service.py +++ b/openstack/common/service.py @@ -32,9 +32,9 @@ import logging as std_logging from openstack.common import cfg from openstack.common import eventlet_backdoor +from openstack.common.gettextutils import _ from openstack.common import log as logging from openstack.common import threadgroup -from openstack.common.gettextutils import _ try: from openstack.common import rpc diff --git a/openstack/common/threadgroup.py b/openstack/common/threadgroup.py index a9dfa5e..ebc066a 100644 --- a/openstack/common/threadgroup.py +++ b/openstack/common/threadgroup.py @@ -17,12 +17,12 @@ import os import sys from eventlet import event -from eventlet import greenthread from eventlet import greenpool +from eventlet import greenthread -from openstack.common import loopingcall from openstack.common.gettextutils import _ from openstack.common import log as logging +from openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/openstack/common/utils.py b/openstack/common/utils.py index 74c571d..220b49e 100644 --- a/openstack/common/utils.py +++ b/openstack/common/utils.py @@ -23,8 +23,8 @@ import logging import random import shlex -from eventlet import greenthread from eventlet.green import subprocess +from eventlet import greenthread from openstack.common import exception from openstack.common.gettextutils import _ diff --git a/openstack/common/wsgi.py b/openstack/common/wsgi.py index 52133a8..614a22c 100644 --- a/openstack/common/wsgi.py +++ b/openstack/common/wsgi.py @@ -33,8 +33,8 @@ from xml.parsers import expat from openstack.common import exception from openstack.common.gettextutils import _ -from openstack.common import log as logging from openstack.common import jsonutils +from openstack.common import log as logging from openstack.common import service |