Merge "Alphabetize imports"

bin/instance-usage-audit

@@ -50,6 +50,7 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
 gettext.install('nova', unicode=1)
+import nova.compute.utils
 from nova import context
 from nova import db
 from nova import exception
@@ -57,7 +58,6 @@ from nova import flags
 from nova import log as logging
 from nova import rpc
 from nova import utils
-import nova.compute.utils
 
 
 FLAGS = flags.FLAGS

nova/auth/dbdriver.py

@@ -21,8 +21,8 @@ Auth driver using the DB as its backend.
 """
 
 from nova import context
-from nova import exception
 from nova import db
+from nova import exception
 
 
 class DbDriver(object):

nova/auth/manager.py

@@ -28,6 +28,7 @@ import string  # pylint: disable=W0402
 import uuid
 import zipfile
 
+from nova.auth import signer
 from nova import context
 from nova import crypto
 from nova import db
@@ -37,7 +38,6 @@ from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova import utils
-from nova.auth import signer
 
 
 auth_opts = [

nova/rpc/impl_kombu.py

@@ -24,9 +24,9 @@ import uuid
 import eventlet
 import greenlet
 import kombu
+import kombu.connection
 import kombu.entity
 import kombu.messaging
-import kombu.connection
 
 from nova.openstack.common import cfg
 from nova.rpc import amqp as rpc_amqp

nova/rpc/impl_qpid.py

@@ -16,9 +16,9 @@
 #    under the License.
 
 import itertools
+import json
 import time
 import uuid
-import json
 
 import eventlet
 import greenlet

nova/testing/runner.py

@@ -59,9 +59,9 @@ To run a single test:
 import gettext
 import heapq
 import os
-import unittest
 import sys
 import time
+import unittest
 
 import eventlet
 from nose import config