From 96b62fbaec43f324a244102f6e2682d1cf532ba0 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Fri, 18 Jan 2013 14:10:05 +0800
Subject: Fixes import order errors

Change-Id: I3e35230dd2d96ab9f5a8c11b9ec1cd8d2d00e347
---
 tests/unit/rpc/test_kombu.py | 2 +-
 tests/unit/test_cfg.py       | 2 +-
 tests/unit/test_gettext.py   | 2 +-
 tests/unit/test_jsonutils.py | 2 +-
 tests/unit/test_lockutils.py | 2 +-
 tests/unit/test_log.py       | 2 +-
 tests/unit/test_setup.py     | 4 ++--
 tests/unit/test_version.py   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index 921415d..d3edbdf 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -33,8 +33,8 @@ from openstack.common import exception
 from openstack.common.rpc import amqp as rpc_amqp
 from openstack.common.rpc import common as rpc_common
 from openstack.common import testutils
-from tests import utils
 from tests.unit.rpc import common
+from tests import utils
 
 try:
     import kombu
diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py
index ff24c0c..b2c14ec 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/unit/test_cfg.py
@@ -16,8 +16,8 @@
 
 import os
 import shutil
-import sys
 import StringIO
+import sys
 import tempfile
 import unittest
 
diff --git a/tests/unit/test_gettext.py b/tests/unit/test_gettext.py
index 52066cb..73ecbf7 100644
--- a/tests/unit/test_gettext.py
+++ b/tests/unit/test_gettext.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import unittest
 import logging
+import unittest
 
 from openstack.common.gettextutils import _
 
diff --git a/tests/unit/test_jsonutils.py b/tests/unit/test_jsonutils.py
index 46b5b36..cc8d26a 100644
--- a/tests/unit/test_jsonutils.py
+++ b/tests/unit/test_jsonutils.py
@@ -16,9 +16,9 @@
 #    under the License.
 
 import datetime
+import StringIO
 import unittest
 import xmlrpclib
-import StringIO
 
 from openstack.common import jsonutils
 
diff --git a/tests/unit/test_lockutils.py b/tests/unit/test_lockutils.py
index 57271a3..85dce05 100644
--- a/tests/unit/test_lockutils.py
+++ b/tests/unit/test_lockutils.py
@@ -24,8 +24,8 @@ import time
 import unittest
 
 import eventlet
-from eventlet import greenthread
 from eventlet import greenpool
+from eventlet import greenthread
 
 from openstack.common import lockutils
 from openstack.common import testutils
diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
index a4a7915..a2ba31a 100644
--- a/tests/unit/test_log.py
+++ b/tests/unit/test_log.py
@@ -5,8 +5,8 @@ import subprocess
 import sys
 import textwrap
 
-from openstack.common import context
 from openstack.common import cfg
+from openstack.common import context
 from openstack.common import jsonutils
 from openstack.common import log
 from openstack.common.notifier import api as notifier
diff --git a/tests/unit/test_setup.py b/tests/unit/test_setup.py
index 660388c..74ade5c 100644
--- a/tests/unit/test_setup.py
+++ b/tests/unit/test_setup.py
@@ -16,9 +16,9 @@
 #    under the License.
 
 import os
-import unittest
-from tempfile import mkstemp
 import sys
+from tempfile import mkstemp
+import unittest
 
 from openstack.common.setup import *
 
diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py
index 99c11f5..21ee094 100644
--- a/tests/unit/test_version.py
+++ b/tests/unit/test_version.py
@@ -17,8 +17,8 @@
 
 import os
 import shutil
-import sys
 import StringIO
+import sys
 import tempfile
 import unittest
 
-- 
cgit