Merge "Fix pep H306 (import order)"

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/test_shell.py b/tests/test_shell.py
index 1448403..75b6a11 100644
--- a/tests/test_shell.py
+++ b/tests/test_shell.py
@@ -13,8 +13,8 @@ except ImportError:
 from keystoneclient.v2_0 import client as ksclient
 
 from ceilometerclient import exc
+from ceilometerclient import shell as ceilometer_shell
 from ceilometerclient.v1 import client as v1client
-import ceilometerclient.shell
 from tests import utils
 
 FAKE_ENV = {'OS_USERNAME': 'username',
@@ -41,7 +41,7 @@ class ShellTest(utils.BaseTestCase):
         orig = sys.stdout
         try:
             sys.stdout = cStringIO.StringIO()
-            _shell = ceilometerclient.shell.CeilometerShell()
+            _shell = ceilometer_shell.CeilometerShell()
             _shell.main(argstr.split())
         except SystemExit:
             exc_type, exc_value, exc_traceback = sys.exc_info()
diff --git a/tests/utils.py b/tests/utils.py
index f0026e2..d9de675 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -15,8 +15,8 @@
 
 import copy
 import fixtures
-import StringIO
 import mox
+import StringIO
 import testtools
 
 from ceilometerclient.common import http