summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2013-05-15 09:57:36 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2013-05-15 09:58:15 +0800
commit926b3e98d63e0a093ff90c0e215446a33fa69c95 (patch)
tree0f8e19370e67bf39f095d01e1b6cb84992d5053b
parente585ef4871a001c3b3393e35017f24fcf44a523e (diff)
downloadoslo-926b3e98d63e0a093ff90c0e215446a33fa69c95.tar.gz
oslo-926b3e98d63e0a093ff90c0e215446a33fa69c95.tar.xz
oslo-926b3e98d63e0a093ff90c0e215446a33fa69c95.zip
Fixes import order nits
Change-Id: I4fdc8eed74dd90d6450864daba7492d5e7266448
-rw-r--r--openstack/common/periodic_task.py1
-rw-r--r--tests/unit/db/sqlalchemy/test_sqlalchemy.py2
-rw-r--r--tests/unit/rpc/common.py2
-rw-r--r--tests/unit/rpc/test_common.py2
-rw-r--r--tests/unit/rpc/test_kombu.py2
-rw-r--r--tests/unit/rpc/test_proxy.py2
-rw-r--r--tests/unit/rpc/test_qpid.py2
-rw-r--r--tests/unit/test_setup.py2
-rw-r--r--tests/utils.py2
9 files changed, 9 insertions, 8 deletions
diff --git a/openstack/common/periodic_task.py b/openstack/common/periodic_task.py
index c48d8b9..4fbb0fe 100644
--- a/openstack/common/periodic_task.py
+++ b/openstack/common/periodic_task.py
@@ -15,6 +15,7 @@
import datetime
import time
+
from oslo.config import cfg
from openstack.common.gettextutils import _
diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
index efe0264..7cbe31d 100644
--- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py
+++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
@@ -19,8 +19,8 @@
"""Unit tests for SQLAlchemy specific code."""
from sqlalchemy import Column, MetaData, Table, UniqueConstraint
-from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy import DateTime, Integer, String
+from sqlalchemy.ext.declarative import declarative_base
from openstack.common.db import exception as db_exc
from openstack.common.db.sqlalchemy import models
diff --git a/tests/unit/rpc/common.py b/tests/unit/rpc/common.py
index c4362b2..32f2a9b 100644
--- a/tests/unit/rpc/common.py
+++ b/tests/unit/rpc/common.py
@@ -19,9 +19,9 @@
Unit Tests for remote procedure calls shared between all implementations
"""
+import datetime
import logging
import time
-import datetime
import eventlet
from oslo.config import cfg
diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py
index 1f07ff7..73ca63b 100644
--- a/tests/unit/rpc/test_common.py
+++ b/tests/unit/rpc/test_common.py
@@ -20,8 +20,8 @@ Unit Tests for 'common' functons used through rpc code.
import logging
import sys
-import six
from oslo.config import cfg
+import six
from openstack.common import exception
from openstack.common import importutils
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index 73ce2ce..ebc29ea 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -26,8 +26,8 @@ import contextlib
import logging
import mock
-import six
from oslo.config import cfg
+import six
from openstack.common import exception
from openstack.common.rpc import amqp as rpc_amqp
diff --git a/tests/unit/rpc/test_proxy.py b/tests/unit/rpc/test_proxy.py
index a84a7ea..8ae4ca8 100644
--- a/tests/unit/rpc/test_proxy.py
+++ b/tests/unit/rpc/test_proxy.py
@@ -25,8 +25,8 @@ import six
from openstack.common import context
from openstack.common import lockutils
from openstack.common import rpc
-from openstack.common.rpc import proxy
from openstack.common.rpc import common as rpc_common
+from openstack.common.rpc import proxy
from tests import utils
diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py
index 0ee05cf..82cc119 100644
--- a/tests/unit/rpc/test_qpid.py
+++ b/tests/unit/rpc/test_qpid.py
@@ -29,8 +29,8 @@ from oslo.config import cfg
from openstack.common import context
from openstack.common.rpc import amqp as rpc_amqp
-from tests import utils
from openstack.common.rpc import common as rpc_common
+from tests import utils
try:
import qpid
diff --git a/tests/unit/test_setup.py b/tests/unit/test_setup.py
index c032592..626d71b 100644
--- a/tests/unit/test_setup.py
+++ b/tests/unit/test_setup.py
@@ -17,8 +17,8 @@
import io
import os
-import sys
import StringIO
+import sys
from tempfile import mkstemp
import fixtures
diff --git a/tests/utils.py b/tests/utils.py
index 591ebef..c5c7c00 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -21,8 +21,8 @@ import fixtures
from oslo.config import cfg
import testtools
-from openstack.common.fixture import moxstubout
from openstack.common import exception
+from openstack.common.fixture import moxstubout
CONF = cfg.CONF