From d6114f914c94e383a125aa7704ad489863bd681e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 16 Dec 2013 10:59:42 +0100 Subject: [PATCH] Fix and enable gating on H306 Fix fallout of Hacking check: Imports should be in alphabetical order Change-Id: I179711c8448208592490ffa47d51419779940014 --- glance/api/middleware/cache.py | 2 +- glance/api/v1/upload_utils.py | 2 +- glance/api/v2/schemas.py | 2 +- glance/api/v2/tasks.py | 12 ++++++------ glance/cmd/api.py | 2 +- glance/tests/functional/__init__.py | 2 +- glance/tests/functional/db/test_registry.py | 2 +- glance/tests/functional/store/__init__.py | 4 ++-- glance/tests/integration/legacy_functional/base.py | 2 +- glance/tests/integration/v2/base.py | 2 +- glance/tests/unit/common/test_rpc.py | 4 ++-- glance/tests/unit/test_auth.py | 2 +- glance/tests/unit/test_domain.py | 2 +- glance/tests/unit/test_glance_replicator.py | 2 +- glance/tests/unit/test_rbd_store.py | 2 +- glance/tests/unit/test_scrubber.py | 2 +- glance/tests/unit/v1/test_api.py | 2 +- glance/tests/unit/v1/test_registry_client.py | 5 ++--- glance/tests/unit/v2/test_registry_client.py | 2 +- glance/tests/utils.py | 4 ++-- tools/migrate_image_owners.py | 2 +- tox.ini | 3 +-- 22 files changed, 31 insertions(+), 33 deletions(-) diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py index a2832bc5d9..2303eacd42 100644 --- a/glance/api/middleware/cache.py +++ b/glance/api/middleware/cache.py @@ -36,8 +36,8 @@ from glance.common import utils from glance.common import wsgi import glance.db from glance import image_cache -import glance.openstack.common.log as logging from glance import notifier +import glance.openstack.common.log as logging import glance.registry.client.v1.api as registry LOG = logging.getLogger(__name__) diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py index 65fbb1770c..8754888b76 100644 --- a/glance/api/v1/upload_utils.py +++ b/glance/api/v1/upload_utils.py @@ -19,9 +19,9 @@ from oslo.config import cfg import webob.exc from glance.common import exception -from glance.openstack.common import excutils from glance.common import utils import glance.db +from glance.openstack.common import excutils import glance.openstack.common.log as logging import glance.registry.client.v1.api as registry import glance.store diff --git a/glance/api/v2/schemas.py b/glance/api/v2/schemas.py index f28cbec2ee..ce771fe6a3 100644 --- a/glance/api/v2/schemas.py +++ b/glance/api/v2/schemas.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from glance.api.v2 import images from glance.api.v2 import image_members +from glance.api.v2 import images from glance.api.v2 import tasks from glance.common import wsgi diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py index cf0869615b..5ab55a2846 100644 --- a/glance/api/v2/tasks.py +++ b/glance/api/v2/tasks.py @@ -22,17 +22,17 @@ import webob.exc from oslo.config import cfg +from glance.api import policy +from glance.common import exception +from glance.common import utils +from glance.common import wsgi import glance.db import glance.gateway import glance.notifier -import glance.schema -import glance.store -from glance.api import policy -from glance.common import wsgi -from glance.common import exception -from glance.common import utils import glance.openstack.common.jsonutils as json from glance.openstack.common import timeutils +import glance.schema +import glance.store CONF = cfg.CONF diff --git a/glance/cmd/api.py b/glance/cmd/api.py index 4fa4c94b80..76a82abe98 100755 --- a/glance/cmd/api.py +++ b/glance/cmd/api.py @@ -39,8 +39,8 @@ if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')): sys.path.insert(0, possible_topdir) from glance.common import config -from glance.common import wsgi from glance.common import exception +from glance.common import wsgi from glance.openstack.common import log import glance.store diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index 550e90f323..63bebbb14a 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -41,9 +41,9 @@ import fixtures from sqlalchemy import create_engine import testtools -from glance import tests as glance_tests from glance.common import utils from glance.openstack.common import units +from glance import tests as glance_tests from glance.tests import utils as test_utils execute, get_unused_port = test_utils.execute, test_utils.get_unused_port diff --git a/glance/tests/functional/db/test_registry.py b/glance/tests/functional/db/test_registry.py index bf75d2a7b1..378352e80d 100644 --- a/glance/tests/functional/db/test_registry.py +++ b/glance/tests/functional/db/test_registry.py @@ -15,8 +15,8 @@ from glance.api import CONF import glance.db.registry.api -import glance.tests.functional.db as db_tests from glance.tests import functional +import glance.tests.functional.db as db_tests from glance.tests.functional.db import base diff --git a/glance/tests/functional/store/__init__.py b/glance/tests/functional/store/__init__.py index e0d96c6067..119aded2d9 100644 --- a/glance/tests/functional/store/__init__.py +++ b/glance/tests/functional/store/__init__.py @@ -20,11 +20,11 @@ import uuid from oslo.config import cfg +#NOTE(bcwaldon): importing this to get the default_store option +import glance.api.v1.images from glance.common import exception import glance.store.location -#NOTE(bcwaldon): importing this to get the default_store option -import glance.api.v1.images CONF = cfg.CONF diff --git a/glance/tests/integration/legacy_functional/base.py b/glance/tests/integration/legacy_functional/base.py index 216c5e49e8..96b4513710 100644 --- a/glance/tests/integration/legacy_functional/base.py +++ b/glance/tests/integration/legacy_functional/base.py @@ -17,13 +17,13 @@ import tempfile import fixtures from oslo.config import cfg -from glance import tests as glance_tests import glance.common.client from glance.common import config import glance.db.sqlalchemy.api import glance.db.sqlalchemy.migration import glance.registry.client.v1.client import glance.store +from glance import tests as glance_tests from glance.tests import utils as test_utils diff --git a/glance/tests/integration/v2/base.py b/glance/tests/integration/v2/base.py index 0e66f78bbb..a351ee06a9 100644 --- a/glance/tests/integration/v2/base.py +++ b/glance/tests/integration/v2/base.py @@ -22,13 +22,13 @@ import tempfile import fixtures from oslo.config import cfg -from glance import tests as glance_tests import glance.common.client from glance.common import config import glance.db.sqlalchemy.api import glance.db.sqlalchemy.migration import glance.registry.client.v1.client import glance.store +from glance import tests as glance_tests from glance.tests import utils as test_utils diff --git a/glance/tests/unit/common/test_rpc.py b/glance/tests/unit/common/test_rpc.py index 2337e21235..855f87885b 100644 --- a/glance/tests/unit/common/test_rpc.py +++ b/glance/tests/unit/common/test_rpc.py @@ -15,17 +15,17 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import json import datetime +import json import mox from oslo.config import cfg import routes import webob +from glance.common import exception from glance.common import rpc from glance.common import wsgi -from glance.common import exception from glance.tests.unit import base from glance.tests import utils as test_utils diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py index b8d0be8aa5..22006f519f 100644 --- a/glance/tests/unit/test_auth.py +++ b/glance/tests/unit/test_auth.py @@ -26,8 +26,8 @@ from glance.common import auth from glance.common import exception import glance.domain from glance.openstack.common import timeutils -from glance.tests import utils from glance.tests.unit import utils as unittest_utils +from glance.tests import utils TENANT1 = '6838eb7b-6ded-434a-882c-b344c77fe8df' diff --git a/glance/tests/unit/test_domain.py b/glance/tests/unit/test_domain.py index ab48a7f51c..f57ed498d0 100644 --- a/glance/tests/unit/test_domain.py +++ b/glance/tests/unit/test_domain.py @@ -22,8 +22,8 @@ from oslo.config import cfg from glance.common import exception from glance import domain from glance.openstack.common import timeutils -import glance.tests.utils as test_utils import glance.tests.unit.utils as unittest_utils +import glance.tests.utils as test_utils CONF = cfg.CONF diff --git a/glance/tests/unit/test_glance_replicator.py b/glance/tests/unit/test_glance_replicator.py index ae43959fb6..74789b19fa 100644 --- a/glance/tests/unit/test_glance_replicator.py +++ b/glance/tests/unit/test_glance_replicator.py @@ -24,8 +24,8 @@ import uuid import fixtures -from glance.tests import utils as test_utils from glance.cmd import replicator as glance_replicator +from glance.tests import utils as test_utils IMG_RESPONSE_ACTIVE = { diff --git a/glance/tests/unit/test_rbd_store.py b/glance/tests/unit/test_rbd_store.py index 8421f76a56..195ba746ed 100644 --- a/glance/tests/unit/test_rbd_store.py +++ b/glance/tests/unit/test_rbd_store.py @@ -20,8 +20,8 @@ import mock from glance.common import exception from glance.common import utils from glance.openstack.common import units -import glance.store.rbd as rbd_store from glance.store.location import Location +import glance.store.rbd as rbd_store from glance.store.rbd import StoreLocation from glance.tests.unit import base from glance.tests.unit.fake_rados import mock_rados diff --git a/glance/tests/unit/test_scrubber.py b/glance/tests/unit/test_scrubber.py index 5531bbe99e..48604e46f8 100644 --- a/glance/tests/unit/test_scrubber.py +++ b/glance/tests/unit/test_scrubber.py @@ -17,8 +17,8 @@ import os import shutil -import time import tempfile +import time import uuid import eventlet diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index 8b1c26b361..38fd22b886 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -41,8 +41,8 @@ from glance.openstack.common import timeutils import glance.registry.client.v1.api as registry import glance.store.filesystem from glance.tests.unit import base -from glance.tests import utils as test_utils import glance.tests.unit.utils as unit_test_utils +from glance.tests import utils as test_utils CONF = cfg.CONF diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py index 40c5eb6b4d..d8084e0f9a 100644 --- a/glance/tests/unit/v1/test_registry_client.py +++ b/glance/tests/unit/v1/test_registry_client.py @@ -23,15 +23,14 @@ import uuid import mox import testtools +from glance.common import client as test_client from glance.common import config from glance.common import exception -from glance.common import client as test_client from glance import context from glance.db.sqlalchemy import api as db_api from glance.openstack.common import timeutils - -import glance.registry.client.v1.api as rapi from glance.registry.api.v1.images import Controller as rcontroller +import glance.registry.client.v1.api as rapi from glance.registry.client.v1.api import client as rclient from glance.tests.unit import base from glance.tests import utils as test_utils diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py index 771d8af40a..e8598bfa83 100644 --- a/glance/tests/unit/v2/test_registry_client.py +++ b/glance/tests/unit/v2/test_registry_client.py @@ -34,9 +34,9 @@ from glance import context from glance.db.sqlalchemy import api as db_api from glance.openstack.common import timeutils +from glance.registry.api import v2 as rserver import glance.registry.client.v2.api as rapi from glance.registry.client.v2.api import client as rclient -from glance.registry.api import v2 as rserver from glance.tests.unit import base from glance.tests import utils as test_utils diff --git a/glance/tests/utils.py b/glance/tests/utils.py index 0d88c8ad26..732b089620 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -36,13 +36,13 @@ import webob from glance.common import config from glance.common import exception +from glance.common import property_utils from glance.common import utils from glance.common import wsgi +from glance import context from glance.db.sqlalchemy import api as db_api from glance.db.sqlalchemy import models as db_models from glance.openstack.common import timeutils -from glance import context -from glance.common import property_utils CONF = cfg.CONF diff --git a/tools/migrate_image_owners.py b/tools/migrate_image_owners.py index f4f651363f..0bd2d5fc63 100644 --- a/tools/migrate_image_owners.py +++ b/tools/migrate_image_owners.py @@ -19,9 +19,9 @@ import keystoneclient.v2_0.client from oslo.config import cfg import glance.context +import glance.db.sqlalchemy.api as db_api import glance.openstack.common.log as logging import glance.registry.context -import glance.db.sqlalchemy.api as db_api LOG = logging.getLogger(__name__) LOG.addHandler(logging.StreamHandler()) diff --git a/tox.ini b/tox.ini index e468b6b667..82963c5d16 100644 --- a/tox.ini +++ b/tox.ini @@ -34,10 +34,9 @@ commands = {posargs} # F821 undefined name 'name' # F841 local variable 'name' assigned but never used # H202 assertRaises Exception too broad -# H306 imports not in alphabetical order # H402 one line docstring needs punctuation. # H404 multi line docstring should start with a summary # H703 multiple positional placeholders -ignore = E711,E712,F811,F821,F841,H202,H306,H402,H404,H703 +ignore = E711,E712,F811,F821,F841,H202,H402,H404,H703 builtins = _ exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build