From b0ff8628e4f548e81e9e861d672bb091e77ba52a Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Mon, 14 May 2012 14:46:11 -0700
Subject: [PATCH] Alphabetize imports

Except for nova/api/, nova/tests/, nova/virt/
In preparation for automated checking being enabled (N306)

Change-Id: I5af70ea13b470ce58695ef0a5e0ff9da3ac1b135
---
 bin/instance-usage-audit | 2 +-
 nova/auth/dbdriver.py    | 2 +-
 nova/auth/manager.py     | 2 +-
 nova/rpc/impl_kombu.py   | 2 +-
 nova/rpc/impl_qpid.py    | 2 +-
 nova/testing/runner.py   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/instance-usage-audit b/bin/instance-usage-audit
index 05f34176..75833680 100755
--- a/bin/instance-usage-audit
+++ b/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
diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py
index 1d337fee..a6ce5a4c 100644
--- a/nova/auth/dbdriver.py
+++ b/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):
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 234b527b..c4e438da 100644
--- a/nova/auth/manager.py
+++ b/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 = [
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index 6ff87646..7285acbe 100644
--- a/nova/rpc/impl_kombu.py
+++ b/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
diff --git a/nova/rpc/impl_qpid.py b/nova/rpc/impl_qpid.py
index 37bb6243..f2f669a5 100644
--- a/nova/rpc/impl_qpid.py
+++ b/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
diff --git a/nova/testing/runner.py b/nova/testing/runner.py
index 4ee88553..2b500439 100644
--- a/nova/testing/runner.py
+++ b/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