Merge "Imports to human alphabetical order"

7 files changed, 9 insertions, 9 deletions

diff --git a/nova/scheduler/multi.py b/nova/scheduler/multi.py
index dcc755d22..b58a23fe7 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 507d5d9fb..651b50af2 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
 
 
diff --git a/nova/tests/api/ec2/test_faults.py b/nova/tests/api/ec2/test_faults.py
index be2b5ffe2..e26b8feaf 100644
--- a/nova/tests/api/ec2/test_faults.py
+++ b/nova/tests/api/ec2/test_faults.py
@@ -14,8 +14,8 @@
 
 import webob
 
-from nova import test
 from nova.api.ec2 import faults
+from nova import test
 
 
 class TestFaults(test.TestCase):
diff --git a/nova/tests/scheduler/fakes.py b/nova/tests/scheduler/fakes.py
index c2d9e4288..83fbfe8b7 100644
--- a/nova/tests/scheduler/fakes.py
+++ b/nova/tests/scheduler/fakes.py
@@ -18,9 +18,9 @@ Fakes For Scheduler tests.
 
 import mox
 
-from nova import db
 from nova.compute import instance_types
 from nova.compute import vm_states
+from nova import db
 from nova.scheduler import filter_scheduler
 from nova.scheduler import host_manager
 
diff --git a/nova/tests/scheduler/test_chance_scheduler.py b/nova/tests/scheduler/test_chance_scheduler.py
index ed6ffeba4..a9bb7a08e 100644
--- a/nova/tests/scheduler/test_chance_scheduler.py
+++ b/nova/tests/scheduler/test_chance_scheduler.py
@@ -24,8 +24,8 @@ import mox
 
 from nova import context
 from nova import exception
-from nova.scheduler import driver
 from nova.scheduler import chance
+from nova.scheduler import driver
 from nova.tests.scheduler import test_scheduler
 
 
diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py
index 733d3a267..0256f2aa3 100644
--- a/nova/tests/scheduler/test_filter_scheduler.py
+++ b/nova/tests/scheduler/test_filter_scheduler.py
@@ -20,9 +20,9 @@ import mox
 
 from nova import context
 from nova import exception
-from nova.scheduler import least_cost
-from nova.scheduler import host_manager
 from nova.scheduler import filter_scheduler
+from nova.scheduler import host_manager
+from nova.scheduler import least_cost
 from nova import test
 from nova.tests.scheduler import fakes
 from nova.tests.scheduler import test_scheduler
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 9658273db..a638f00ec 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -22,11 +22,11 @@ Driver base-classes:
     types that support that contract
 """
 
+from nova.compute import power_state
 from nova import context as nova_context
 from nova import db
 from nova import flags
 from nova import log as logging
-from nova.compute import power_state
 
 
 LOG = logging.getLogger(__name__)