Merge "Fix pep H306 (import order)"

ceilometerclient/common/utils.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import errno
-import hashlib
 import os
 import sys
 import textwrap

ceilometerclient/shell.py

@@ -23,8 +23,8 @@ from keystoneclient.v2_0 import client as ksclient
 
 import ceilometerclient
 from ceilometerclient import client as ceiloclient
-from ceilometerclient import exc
 from ceilometerclient.common import utils
+from ceilometerclient import exc
 
 
 class CeilometerShell(object):

ceilometerclient/v2/shell.py

@@ -17,8 +17,8 @@
 #    under the License.
 
 from ceilometerclient.common import utils
+from ceilometerclient import exc
 from ceilometerclient.v2 import options
-import ceilometerclient.exc as exc
 
 
 @utils.arg('-q', '--query', metavar='<QUERY>',

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()

tests/utils.py

@@ -15,8 +15,8 @@
 
 import copy
 import fixtures
-import StringIO
 import mox
+import StringIO
 import testtools
 
 from ceilometerclient.common import http