From f5a3bfd26ebaca695d85335fcb2bfbd9fcedbdf1 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Thu, 26 Apr 2012 15:20:43 -0700
Subject: [PATCH] Imports to human alphabetical order

Problems identified by enabling N306 in run_tests.sh

Change-Id: Ifddfe58da020dd041bcbbf5f14941514a09f61c1
---
 bin/nova-all             | 2 +-
 bin/nova-consoleauth     | 2 +-
 bin/nova-dhcpbridge      | 2 +-
 bin/nova-objectstore     | 2 +-
 nova/scheduler/multi.py  | 2 +-
 nova/scheduler/simple.py | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/nova-all b/bin/nova-all
index 5edf3328..143ab2be 100755
--- a/bin/nova-all
+++ b/bin/nova-all
@@ -42,9 +42,9 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
 
 from nova import flags
 from nova import log as logging
+from nova.objectstore import s3server
 from nova import service
 from nova import utils
-from nova.objectstore import s3server
 from nova.vnc import xvp_proxy
 
 
diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth
index 325a399d..fbc9ad84 100755
--- a/bin/nova-consoleauth
+++ b/bin/nova-consoleauth
@@ -31,11 +31,11 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 
+from nova.consoleauth import manager
 from nova import flags
 from nova import log as logging
 from nova import service
 from nova import utils
-from nova.consoleauth import manager
 
 
 if __name__ == "__main__":
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index e9b822c8..162fdd5a 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -39,9 +39,9 @@ from nova import context
 from nova import db
 from nova import flags
 from nova import log as logging
+from nova.network import linux_net
 from nova import rpc
 from nova import utils
-from nova.network import linux_net
 
 FLAGS = flags.FLAGS
 
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 957de821..70553ea0 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -36,9 +36,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 from nova import flags
 from nova import log as logging
+from nova.objectstore import s3server
 from nova import service
 from nova import utils
-from nova.objectstore import s3server
 
 
 if __name__ == '__main__':
diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py
index dcc755d2..b58a23fe 100644
--- a/nova/scheduler/multi.py
+++ b/nova/scheduler/multi.py
@@ -23,8 +23,8 @@ Scheduler that allows routing some calls to one driver and others to another.
 
 from nova import flags
 from nova.openstack.common import cfg
-from nova import utils
 from nova.scheduler import driver
+from nova import utils
 
 
 multi_scheduler_opts = [
diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py
index 507d5d9f..651b50af 100644
--- a/nova/scheduler/simple.py
+++ b/nova/scheduler/simple.py
@@ -22,11 +22,11 @@ Simple Scheduler
 """
 
 from nova import db
-from nova import flags
 from nova import exception
+from nova import flags
 from nova.openstack.common import cfg
-from nova.scheduler import driver
 from nova.scheduler import chance
+from nova.scheduler import driver
 from nova import utils