Fix alpha-ordering of imports for pep8

Breaking up the pep8 fixes by classes of problem so they are in
smaller chunks.

Change-Id: I600f456082cdd525d22462563df27c3772e91425

placement/handler.py

@@ -39,8 +39,8 @@ from placement.handlers import resource_provider
 from placement.handlers import root
 from placement.handlers import trait
 from placement.handlers import usage
-from placement import util
 from placement.i18n import _
+from placement import util
 
 LOG = logging.getLogger(__name__)
 

placement/handlers/aggregate.py

@@ -19,13 +19,13 @@ import webob
 
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import aggregate as policies
 from placement.schemas import aggregate as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 _INCLUDE_GENERATION_VERSION = (1, 19)

placement/handlers/allocation.py

@@ -24,13 +24,13 @@ import webob
 
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import allocation as policies
 from placement.schemas import allocation as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 LOG = logging.getLogger(__name__)

placement/handlers/allocation_candidate.py

@@ -21,6 +21,7 @@ import six
 import webob
 
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import allocation_candidate as \
@@ -28,7 +29,6 @@ from placement.policies import allocation_candidate as \
 from placement.schemas import allocation_candidate as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 def _transform_allocation_requests_dict(alloc_reqs):

placement/handlers/inventory.py

@@ -19,16 +19,16 @@ from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 import webob
 
+from placement.db import constants as db_const
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import inventory as policies
 from placement.schemas import inventory as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.db import constants as db_const
-from placement.i18n import _
 
 
 # NOTE(cdent): We keep our own representation of inventory defaults

placement/handlers/reshaper.py

@@ -28,14 +28,13 @@ from placement import exception
 # extracted from the handler to a shared module.
 from placement.handlers import allocation
 from placement.handlers import inventory
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import reshaper as policies
 from placement.schemas import reshaper as schema
 from placement import util
 from placement import wsgi_wrapper
-# TODO(cdent): placement needs its own version of this
-from placement.i18n import _
 
 
 @wsgi_wrapper.PlacementWsgify

placement/handlers/resource_class.py

@@ -17,13 +17,13 @@ from oslo_utils import timeutils
 import webob
 
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import resource_class as policies
 from placement.schemas import resource_class as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 def _serialize_links(environ, rc):

placement/handlers/resource_provider.py

@@ -22,13 +22,13 @@ import webob
 
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import resource_provider as policies
 from placement.schemas import resource_provider as rp_schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 def _serialize_links(environ, resource_provider):

placement/handlers/trait.py

@@ -19,13 +19,13 @@ import webob
 
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import trait as policies
 from placement.schemas import trait as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 def _normalize_traits_qs_param(qs):

placement/handlers/usage.py

@@ -17,13 +17,13 @@ from oslo_utils import timeutils
 import webob
 
 from placement import exception
+from placement.i18n import _
 from placement import microversion
 from placement.objects import resource_provider as rp_obj
 from placement.policies import usage as policies
 from placement.schemas import usage as schema
 from placement import util
 from placement import wsgi_wrapper
-from placement.i18n import _
 
 
 def _serialize_usages(resource_provider, usage):

placement/objects/consumer.py

@@ -15,11 +15,11 @@ from oslo_versionedobjects import base
 from oslo_versionedobjects import fields
 import sqlalchemy as sa
 
+from placement.db.sqlalchemy import api_models as models
 from placement import db_api
 from placement import exception
 from placement.objects import project as project_obj
 from placement.objects import user as user_obj
-from placement.db.sqlalchemy import api_models as models
 
 CONSUMER_TBL = models.Consumer.__table__
 _ALLOC_TBL = models.Allocation.__table__

placement/objects/project.py

@@ -16,9 +16,9 @@ from oslo_versionedobjects import base
 from oslo_versionedobjects import fields
 import sqlalchemy as sa
 
+from placement.db.sqlalchemy import api_models as models
 from placement import db_api
 from placement import exception
-from placement.db.sqlalchemy import api_models as models
 
 CONF = cfg.CONF
 PROJECT_TBL = models.Project.__table__

placement/objects/resource_provider.py

@@ -37,15 +37,15 @@ from sqlalchemy import func
 from sqlalchemy import sql
 from sqlalchemy.sql import null
 
+from placement.db.sqlalchemy import api_models as models
 from placement import db_api
 from placement import exception
+from placement.i18n import _
 from placement.objects import consumer as consumer_obj
 from placement.objects import project as project_obj
 from placement.objects import user as user_obj
-from placement import resource_class_cache as rc_cache
-from placement.db.sqlalchemy import api_models as models
-from placement.i18n import _
 from placement import rc_fields
+from placement import resource_class_cache as rc_cache
 
 _TRAIT_TBL = models.Trait.__table__
 _ALLOC_TBL = models.Allocation.__table__

placement/objects/user.py

@@ -16,9 +16,9 @@ from oslo_versionedobjects import base
 from oslo_versionedobjects import fields
 import sqlalchemy as sa
 
+from placement.db.sqlalchemy import api_models as models
 from placement import db_api
 from placement import exception
-from placement.db.sqlalchemy import api_models as models
 
 CONF = cfg.CONF
 USER_TBL = models.User.__table__

placement/resource_class_cache.py

@@ -13,9 +13,9 @@
 from oslo_concurrency import lockutils
 import sqlalchemy as sa
 
+from placement.db.sqlalchemy import api_models as models
 from placement import db_api
 from placement import exception
-from placement.db.sqlalchemy import api_models as models
 from placement import rc_fields as fields
 
 _RC_TBL = models.ResourceClass.__table__

placement/schemas/inventory.py

@@ -13,8 +13,8 @@
 
 import copy
 
-from placement.schemas import common
 from placement.db import constants as db_const
+from placement.schemas import common
 
 
 BASE_INVENTORY_SCHEMA = {

placement/tests/fixtures.py

@@ -39,9 +39,9 @@ from oslo_utils import uuidutils
 from requests import adapters
 from wsgi_intercept import interceptor
 
-from placement import db_api as placement_db
 from placement import context
 from placement.db import migration
+from placement import db_api as placement_db
 from placement import exception
 from placement import objects
 from placement.tests import uuidsentinel

placement/tests/functional/db/test_resource_class_cache.py

@@ -16,8 +16,8 @@ import mock
 from oslo_utils import timeutils
 
 from placement import exception
-from placement import resource_class_cache as rc_cache
 from placement import rc_fields as fields
+from placement import resource_class_cache as rc_cache
 from placement.tests.functional import base
 
 

placement/tests/functional/db/test_resource_provider.py

@@ -18,10 +18,10 @@ from oslo_db import exception as db_exc
 import sqlalchemy as sa
 
 import placement
+from placement.db.sqlalchemy import api_models as models
 from placement import exception
 from placement.objects import consumer as consumer_obj
 from placement.objects import resource_provider as rp_obj
-from placement.db.sqlalchemy import api_models as models
 from placement import rc_fields as fields
 from placement.tests.functional.db import test_base as tb
 from placement.tests import uuidsentinel

placement/tests/unit/policy_fixture.py

@@ -18,10 +18,10 @@ import fixtures
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
 
-from placement import policy as placement_policy
 import placement.conf
 from placement.conf import paths
 from placement import policies
+from placement import policy as placement_policy
 
 CONF = placement.conf.CONF
 

placement/tests/unit/test_util.py

@@ -33,8 +33,8 @@ from placement.objects import consumer as consumer_obj
 from placement.objects import project as project_obj
 from placement.objects import resource_provider as rp_obj
 from placement.objects import user as user_obj
-from placement import util
 from placement.tests import uuidsentinel
+from placement import util
 
 CONF = cfg.CONF
 

placement/util.py

@@ -25,6 +25,7 @@ import webob
 
 from placement import errors
 from placement import exception
+from placement.i18n import _
 from placement import lib as placement_lib
 # NOTE(cdent): avoid cyclical import conflict between util and
 # microversion
@@ -32,7 +33,6 @@ import placement.microversion
 from placement.objects import consumer as consumer_obj
 from placement.objects import project as project_obj
 from placement.objects import user as user_obj
-from placement.i18n import _
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

placement/wsgi.py

@@ -24,9 +24,9 @@ from oslo_policy import opts as policy_opts
 from oslo_utils import importutils
 import pbr.version
 
+from placement import conf
 from placement import db_api
 from placement import deploy
-from placement import conf
 
 
 profiler = importutils.try_import('osprofiler.opts')