From 799319baab50c29c8bc5f1c4cd2e2cd33341f24b Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Thu, 17 Jul 2014 17:43:38 +0200 Subject: [PATCH] Enabled hacking checks H305 and H307 * H305 imports not grouped correctly * H307 like imports should be grouped together Change-Id: I9dc5f995ea07d7c319d944e847a9d1c126937240 --- bin/manila-all | 1 - bin/manila-api | 1 - bin/manila-clear-rabbit-queues | 1 - bin/manila-scheduler | 1 - bin/manila-share | 1 - .../tempest/api/share/admin/test_quotas_negative.py | 2 +- .../tempest/tempest/api/share/test_quotas_negative.py | 2 +- contrib/tempest/tempest/api/share/test_shares.py | 2 +- .../tempest/tempest/api/share/test_shares_negative.py | 2 +- contrib/tempest/tempest/config_share.py | 2 +- manila/api/__init__.py | 1 - manila/api/contrib/__init__.py | 7 +++---- manila/api/contrib/quotas.py | 1 + manila/api/contrib/share_actions.py | 1 + manila/api/middleware/auth.py | 1 - manila/api/urlmap.py | 3 ++- manila/api/v1/router.py | 4 +--- manila/api/v1/share_metadata.py | 2 +- manila/api/versions.py | 4 ++-- manila/db/api.py | 1 - manila/db/sqlalchemy/migration.py | 10 +++------- manila/network/__init__.py | 3 ++- manila/scheduler/chance.py | 7 +++---- manila/scheduler/driver.py | 1 - manila/scheduler/filter_scheduler.py | 5 ++--- manila/scheduler/simple.py | 1 - manila/share/drivers/generic.py | 2 +- manila/share/drivers/netapp/api.py | 3 ++- manila/share/drivers/service_instance.py | 2 +- manila/tests/__init__.py | 1 - manila/tests/api/contrib/test_admin_actions.py | 2 +- manila/tests/api/contrib/test_types_extra_specs.py | 1 - manila/tests/api/middleware/test_sizelimit.py | 4 ++-- manila/tests/api/test_extensions.py | 3 +-- manila/tests/api/test_router.py | 3 +-- manila/tests/compute/test_nova.py | 4 ++-- manila/tests/fake_utils.py | 1 + manila/tests/integrated/test_extensions.py | 2 +- manila/tests/netapp/test_7mode_drv.py | 1 - manila/tests/netapp/test_cmode_drv.py | 1 + manila/tests/test_policy.py | 6 +++--- manila/tests/test_share.py | 3 +-- manila/tests/test_share_generic.py | 2 +- manila/tests/test_share_glusterfs.py | 9 ++++----- manila/tests/volume/test_cinder.py | 3 +-- manila/tests/windows/basetestcase.py | 2 +- manila/utils.py | 8 ++++---- tox.ini | 4 +--- 48 files changed, 56 insertions(+), 78 deletions(-) diff --git a/bin/manila-all b/bin/manila-all index 456d115115..1a376173c5 100755 --- a/bin/manila-all +++ b/bin/manila-all @@ -41,7 +41,6 @@ if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): from manila.openstack.common import gettextutils gettextutils.install('manila') - from manila.common import config # Need to register global_opts from manila.openstack.common import log as logging from manila import service diff --git a/bin/manila-api b/bin/manila-api index 172b18b60c..afc7aa60e4 100755 --- a/bin/manila-api +++ b/bin/manila-api @@ -38,7 +38,6 @@ if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")): from manila.openstack.common import gettextutils gettextutils.install('manila') - from manila.common import config # Need to register global_opts from manila.openstack.common import log as logging from manila import service diff --git a/bin/manila-clear-rabbit-queues b/bin/manila-clear-rabbit-queues index 4d3cab1352..9b70885145 100755 --- a/bin/manila-clear-rabbit-queues +++ b/bin/manila-clear-rabbit-queues @@ -39,7 +39,6 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'manila', '__init__.py')): from manila.openstack.common import gettextutils gettextutils.install('manila') - from manila.common import config # Need to register global_opts from manila import context from manila import exception diff --git a/bin/manila-scheduler b/bin/manila-scheduler index 0ae1136ff6..45575ad4f0 100755 --- a/bin/manila-scheduler +++ b/bin/manila-scheduler @@ -37,7 +37,6 @@ if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): from manila.openstack.common import gettextutils gettextutils.install('manila') - from manila.common import config # Need to register global_opts from manila.openstack.common import log as logging from manila import service diff --git a/bin/manila-share b/bin/manila-share index 647f38b6f1..e8b1474ec8 100755 --- a/bin/manila-share +++ b/bin/manila-share @@ -36,7 +36,6 @@ if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')): from manila.openstack.common import gettextutils gettextutils.install('manila') - from manila.common import config # Need to register global_opts from manila.openstack.common import log as logging from manila import service diff --git a/contrib/tempest/tempest/api/share/admin/test_quotas_negative.py b/contrib/tempest/tempest/api/share/admin/test_quotas_negative.py index 16baddc675..99d0d997f7 100644 --- a/contrib/tempest/tempest/api/share/admin/test_quotas_negative.py +++ b/contrib/tempest/tempest/api/share/admin/test_quotas_negative.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools +import testtools # noqa from tempest.api.share import base from tempest import clients_share as clients diff --git a/contrib/tempest/tempest/api/share/test_quotas_negative.py b/contrib/tempest/tempest/api/share/test_quotas_negative.py index 2806535357..e64f7b2c95 100644 --- a/contrib/tempest/tempest/api/share/test_quotas_negative.py +++ b/contrib/tempest/tempest/api/share/test_quotas_negative.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools +import testtools # noqa from tempest.api.share import base from tempest import exceptions diff --git a/contrib/tempest/tempest/api/share/test_shares.py b/contrib/tempest/tempest/api/share/test_shares.py index 10bdefc3b6..f74489c8f8 100644 --- a/contrib/tempest/tempest/api/share/test_shares.py +++ b/contrib/tempest/tempest/api/share/test_shares.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools +import testtools # noqa from tempest.api.share import base from tempest import config_share as config diff --git a/contrib/tempest/tempest/api/share/test_shares_negative.py b/contrib/tempest/tempest/api/share/test_shares_negative.py index 8413110a8e..05c9fb718c 100644 --- a/contrib/tempest/tempest/api/share/test_shares_negative.py +++ b/contrib/tempest/tempest/api/share/test_shares_negative.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools +import testtools # noqa from tempest.api.share import base from tempest import config_share as config diff --git a/contrib/tempest/tempest/config_share.py b/contrib/tempest/tempest/config_share.py index c02119dfa6..57ca3116b8 100644 --- a/contrib/tempest/tempest/config_share.py +++ b/contrib/tempest/tempest/config_share.py @@ -17,7 +17,7 @@ from __future__ import print_function from oslo.config import cfg -from tempest import config +from tempest import config # noqa service_available_group = cfg.OptGroup(name="service_available", title="Available OpenStack Services") diff --git a/manila/api/__init__.py b/manila/api/__init__.py index 36da84d5a9..676e6201e0 100644 --- a/manila/api/__init__.py +++ b/manila/api/__init__.py @@ -17,7 +17,6 @@ # under the License. from oslo.config import cfg - import paste.urlmap diff --git a/manila/api/contrib/__init__.py b/manila/api/contrib/__init__.py index 218b547f8e..45a33d4894 100644 --- a/manila/api/contrib/__init__.py +++ b/manila/api/contrib/__init__.py @@ -21,12 +21,11 @@ It can't be called 'extensions' because that causes namespacing problems. """ -from manila.api import extensions - -from manila.openstack.common import log as logging - from oslo.config import cfg +from manila.api import extensions +from manila.openstack.common import log as logging + CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/manila/api/contrib/quotas.py b/manila/api/contrib/quotas.py index 368983dc8f..5e8de43abb 100644 --- a/manila/api/contrib/quotas.py +++ b/manila/api/contrib/quotas.py @@ -16,6 +16,7 @@ # under the License. import urlparse + import webob from manila.api import extensions diff --git a/manila/api/contrib/share_actions.py b/manila/api/contrib/share_actions.py index 447b15a0c1..812a08e524 100644 --- a/manila/api/contrib/share_actions.py +++ b/manila/api/contrib/share_actions.py @@ -13,6 +13,7 @@ # under the License. import re + import webob from manila.api import extensions diff --git a/manila/api/middleware/auth.py b/manila/api/middleware/auth.py index 258483a199..df0de85ff5 100644 --- a/manila/api/middleware/auth.py +++ b/manila/api/middleware/auth.py @@ -27,7 +27,6 @@ import webob.exc from manila.api.openstack import wsgi from manila import context from manila.openstack.common import jsonutils - from manila.openstack.common import log as logging from manila import wsgi as base_wsgi diff --git a/manila/api/urlmap.py b/manila/api/urlmap.py index c291962b78..1eb941fe50 100644 --- a/manila/api/urlmap.py +++ b/manila/api/urlmap.py @@ -15,10 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. -import paste.urlmap import re import urllib2 +import paste.urlmap + from manila.api.openstack import wsgi from manila.openstack.common import log as logging diff --git a/manila/api/v1/router.py b/manila/api/v1/router.py index bec9768147..a722b4aedd 100644 --- a/manila/api/v1/router.py +++ b/manila/api/v1/router.py @@ -24,8 +24,6 @@ WSGI middleware for OpenStack Share API. from manila.api import extensions import manila.api.openstack from manila.api.v1 import limits -from manila.api import versions - from manila.api.v1 import security_service from manila.api.v1 import share_metadata from manila.api.v1 import share_networks @@ -33,7 +31,7 @@ from manila.api.v1 import share_servers from manila.api.v1 import share_snapshots from manila.api.v1 import shares from manila.api.v1 import volume_types - +from manila.api import versions from manila.openstack.common import log as logging diff --git a/manila/api/v1/share_metadata.py b/manila/api/v1/share_metadata.py index 37a9fb1d2c..e26a5afa8c 100644 --- a/manila/api/v1/share_metadata.py +++ b/manila/api/v1/share_metadata.py @@ -16,12 +16,12 @@ # under the License. import webob +from webob import exc from manila.api import common from manila.api.openstack import wsgi from manila import exception from manila import share -from webob import exc class ShareMetadataController(object): diff --git a/manila/api/versions.py b/manila/api/versions.py index 8563028879..f9a19d90db 100644 --- a/manila/api/versions.py +++ b/manila/api/versions.py @@ -16,14 +16,14 @@ # under the License. import datetime + from lxml import etree +from oslo.config import cfg from manila.api.openstack import wsgi from manila.api.views import versions as views_versions from manila.api import xmlutil -from oslo.config import cfg - CONF = cfg.CONF diff --git a/manila/db/api.py b/manila/db/api.py index ed7e96a20b..cc4bc5909b 100644 --- a/manila/db/api.py +++ b/manila/db/api.py @@ -46,7 +46,6 @@ these objects be simple dictionaries. from oslo.config import cfg from manila import exception - from manila import utils db_opts = [ diff --git a/manila/db/sqlalchemy/migration.py b/manila/db/sqlalchemy/migration.py index a0fa5aaddc..e73439e39c 100644 --- a/manila/db/sqlalchemy/migration.py +++ b/manila/db/sqlalchemy/migration.py @@ -19,20 +19,16 @@ import distutils.version as dist_version import os +import migrate +from migrate.versioning import util as migrate_util from oslo.config import cfg +import sqlalchemy from manila.db import migration from manila.db.sqlalchemy.session import get_engine from manila import exception - from manila.openstack.common import log as logging - -import migrate -from migrate.versioning import util as migrate_util -import sqlalchemy - - LOG = logging.getLogger(__name__) diff --git a/manila/network/__init__.py b/manila/network/__init__.py index fd122bd12a..7dd87051aa 100644 --- a/manila/network/__init__.py +++ b/manila/network/__init__.py @@ -16,9 +16,10 @@ # under the License. import abc -import manila.openstack.common.importutils from oslo.config import cfg +import manila.openstack.common.importutils + network_opts = [ cfg.StrOpt('network_api_class', default='manila.network.neutron.' diff --git a/manila/scheduler/chance.py b/manila/scheduler/chance.py index 65d283ad39..206fccd137 100644 --- a/manila/scheduler/chance.py +++ b/manila/scheduler/chance.py @@ -23,12 +23,11 @@ Chance (Random) Scheduler implementation import random -from manila import exception - -from manila.scheduler import driver - from oslo.config import cfg +from manila import exception +from manila.scheduler import driver + CONF = cfg.CONF diff --git a/manila/scheduler/driver.py b/manila/scheduler/driver.py index 81a0a6c73c..bfe006b484 100644 --- a/manila/scheduler/driver.py +++ b/manila/scheduler/driver.py @@ -24,7 +24,6 @@ Scheduler base class that all Schedulers should inherit from from oslo.config import cfg from manila import db - from manila.openstack.common import importutils from manila.openstack.common import timeutils from manila.share import rpcapi as share_rpcapi diff --git a/manila/scheduler/filter_scheduler.py b/manila/scheduler/filter_scheduler.py index 080123f2ed..bfcfe91608 100644 --- a/manila/scheduler/filter_scheduler.py +++ b/manila/scheduler/filter_scheduler.py @@ -22,15 +22,14 @@ Weighing Functions. import operator -from manila import exception +from oslo.config import cfg +from manila import exception from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila.scheduler import driver from manila.scheduler import scheduler_options -from oslo.config import cfg - CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/manila/scheduler/simple.py b/manila/scheduler/simple.py index f699c135ab..7449d3574e 100644 --- a/manila/scheduler/simple.py +++ b/manila/scheduler/simple.py @@ -25,7 +25,6 @@ from oslo.config import cfg from manila import db from manila import exception - from manila.scheduler import chance from manila.scheduler import driver from manila import utils diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py index 98e6667071..38f8f7ea3e 100644 --- a/manila/share/drivers/generic.py +++ b/manila/share/drivers/generic.py @@ -14,8 +14,8 @@ # under the License. """Generic Driver for shares.""" -import ConfigParser +import ConfigParser import os import re import shutil diff --git a/manila/share/drivers/netapp/api.py b/manila/share/drivers/netapp/api.py index 3d52f31722..7680add33b 100644 --- a/manila/share/drivers/netapp/api.py +++ b/manila/share/drivers/netapp/api.py @@ -18,9 +18,10 @@ NetApp api for ONTAP and OnCommand DFM. Contains classes required to issue api calls to ONTAP and OnCommand DFM. """ -from lxml import etree import urllib2 +from lxml import etree + from manila.openstack.common import log diff --git a/manila/share/drivers/service_instance.py b/manila/share/drivers/service_instance.py index e6d6a57a35..8ef0fcc545 100644 --- a/manila/share/drivers/service_instance.py +++ b/manila/share/drivers/service_instance.py @@ -15,12 +15,12 @@ """Module for managing nova instances for share drivers.""" -import netaddr import os import socket import threading import time +import netaddr from oslo.config import cfg from manila.common import constants diff --git a/manila/tests/__init__.py b/manila/tests/__init__.py index a0aebc3790..760bad6e71 100644 --- a/manila/tests/__init__.py +++ b/manila/tests/__init__.py @@ -30,7 +30,6 @@ import eventlet eventlet.monkey_patch() - from oslo.config import cfg # See http://code.google.com/p/python-nose/issues/detail?id=373 diff --git a/manila/tests/api/contrib/test_admin_actions.py b/manila/tests/api/contrib/test_admin_actions.py index 8de2690e7c..62487c3532 100644 --- a/manila/tests/api/contrib/test_admin_actions.py +++ b/manila/tests/api/contrib/test_admin_actions.py @@ -15,9 +15,9 @@ import shutil import tempfile -import webob from oslo.config import cfg +import webob from manila import context from manila import db diff --git a/manila/tests/api/contrib/test_types_extra_specs.py b/manila/tests/api/contrib/test_types_extra_specs.py index 239906d7fd..5f4ed88a6d 100644 --- a/manila/tests/api/contrib/test_types_extra_specs.py +++ b/manila/tests/api/contrib/test_types_extra_specs.py @@ -16,7 +16,6 @@ # under the License. from lxml import etree - import mock import webob diff --git a/manila/tests/api/middleware/test_sizelimit.py b/manila/tests/api/middleware/test_sizelimit.py index 1844b70b69..7ca412a4ac 100644 --- a/manila/tests/api/middleware/test_sizelimit.py +++ b/manila/tests/api/middleware/test_sizelimit.py @@ -13,13 +13,13 @@ # under the License. import StringIO + +from oslo.config import cfg import webob from manila.api.middleware import sizelimit - from manila import test -from oslo.config import cfg CONF = cfg.CONF MAX_REQUEST_BODY_SIZE = CONF.osapi_max_request_body_size diff --git a/manila/tests/api/test_extensions.py b/manila/tests/api/test_extensions.py index 4f0e7672a4..8f1c41992e 100644 --- a/manila/tests/api/test_extensions.py +++ b/manila/tests/api/test_extensions.py @@ -18,14 +18,13 @@ import iso8601 from lxml import etree +from oslo.config import cfg import webob from manila.api.v1 import router from manila.api import xmlutil - from manila.openstack.common import jsonutils from manila import test -from oslo.config import cfg CONF = cfg.CONF NS = "{http://docs.openstack.org/common/api/v1.0}" diff --git a/manila/tests/api/test_router.py b/manila/tests/api/test_router.py index d381be13e4..f6aee7e28f 100644 --- a/manila/tests/api/test_router.py +++ b/manila/tests/api/test_router.py @@ -13,15 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg from manila.api.openstack import wsgi from manila.api.v1 import router from manila.api import versions - from manila.openstack.common import log as logging from manila import test from manila.tests.api import fakes -from oslo.config import cfg CONF = cfg.CONF diff --git a/manila/tests/compute/test_nova.py b/manila/tests/compute/test_nova.py index 376506dd92..1009b45c90 100644 --- a/manila/tests/compute/test_nova.py +++ b/manila/tests/compute/test_nova.py @@ -13,14 +13,14 @@ # under the License. import mock +from novaclient import exceptions as nova_exception +from novaclient.v1_1 import servers as nova_servers from manila.compute import nova from manila import context from manila import exception from manila import test from manila.volume import cinder -from novaclient import exceptions as nova_exception -from novaclient.v1_1 import servers as nova_servers class Volume(object): diff --git a/manila/tests/fake_utils.py b/manila/tests/fake_utils.py index 877fb35c85..180c3f6ae3 100644 --- a/manila/tests/fake_utils.py +++ b/manila/tests/fake_utils.py @@ -19,6 +19,7 @@ import re from eventlet import greenthread + from manila import exception from manila.openstack.common import log as logging from manila import utils diff --git a/manila/tests/integrated/test_extensions.py b/manila/tests/integrated/test_extensions.py index 264de8bb6d..a3c61855ec 100644 --- a/manila/tests/integrated/test_extensions.py +++ b/manila/tests/integrated/test_extensions.py @@ -15,10 +15,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo.config import cfg from manila.openstack.common import log as logging from manila.tests.integrated import integrated_helpers -from oslo.config import cfg CONF = cfg.CONF diff --git a/manila/tests/netapp/test_7mode_drv.py b/manila/tests/netapp/test_7mode_drv.py index e88a64fc1c..d3d9f8bce5 100644 --- a/manila/tests/netapp/test_7mode_drv.py +++ b/manila/tests/netapp/test_7mode_drv.py @@ -14,7 +14,6 @@ # under the License. import mock - from oslo.config import cfg from manila import context diff --git a/manila/tests/netapp/test_cmode_drv.py b/manila/tests/netapp/test_cmode_drv.py index bd990099f1..bf5491ccce 100644 --- a/manila/tests/netapp/test_cmode_drv.py +++ b/manila/tests/netapp/test_cmode_drv.py @@ -14,6 +14,7 @@ # under the License. import hashlib + import mock from manila import context diff --git a/manila/tests/test_policy.py b/manila/tests/test_policy.py index 0bc39e12c0..66a98c5644 100644 --- a/manila/tests/test_policy.py +++ b/manila/tests/test_policy.py @@ -15,13 +15,13 @@ """Test of Policy Engine For Manila.""" -import mock import os.path + +import mock +from oslo.config import cfg import six from six.moves.urllib import request as urlrequest -from oslo.config import cfg - from manila import context from manila import exception from manila.openstack.common import policy as common_policy diff --git a/manila/tests/test_share.py b/manila/tests/test_share.py index 5e020a9f84..58e5c51d84 100644 --- a/manila/tests/test_share.py +++ b/manila/tests/test_share.py @@ -19,16 +19,15 @@ Tests for Share Code. """ import mock +from oslo.config import cfg from manila import context from manila import db from manila import exception - from manila.openstack.common import importutils import manila.policy from manila.share import manager from manila import test -from oslo.config import cfg CONF = cfg.CONF diff --git a/manila/tests/test_share_generic.py b/manila/tests/test_share_generic.py index e177b891b4..87e37bb728 100644 --- a/manila/tests/test_share_generic.py +++ b/manila/tests/test_share_generic.py @@ -15,9 +15,9 @@ """Unit tests for the Generic driver module.""" -import mock import os +import mock from oslo.config import cfg from manila import compute diff --git a/manila/tests/test_share_glusterfs.py b/manila/tests/test_share_glusterfs.py index 7255f7266d..6f1a705b34 100644 --- a/manila/tests/test_share_glusterfs.py +++ b/manila/tests/test_share_glusterfs.py @@ -16,15 +16,16 @@ # under the License. import errno -from mock import Mock -from mock import patch import os import subprocess +from mock import Mock +from mock import patch +from oslo.config import cfg + from manila import context from manila.db.sqlalchemy import models from manila import exception - from manila.openstack.common import importutils from manila.openstack.common import log as logging from manila.share import configuration as config @@ -33,8 +34,6 @@ from manila import test from manila.tests.db import fakes as db_fakes from manila.tests import fake_utils -from oslo.config import cfg - CONF = cfg.CONF diff --git a/manila/tests/volume/test_cinder.py b/manila/tests/volume/test_cinder.py index 3b658cd52a..83a331d611 100644 --- a/manila/tests/volume/test_cinder.py +++ b/manila/tests/volume/test_cinder.py @@ -14,9 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock - from cinderclient import exceptions as cinder_exception +import mock from manila import context from manila import exception diff --git a/manila/tests/windows/basetestcase.py b/manila/tests/windows/basetestcase.py index a8be34d612..e0f0e76e80 100644 --- a/manila/tests/windows/basetestcase.py +++ b/manila/tests/windows/basetestcase.py @@ -19,10 +19,10 @@ TestCase for MockProxy based tests and related classes. """ import gzip -import manila.test import os import pickle +import manila.test from manila.tests.windows import mockproxy gen_test_mocks_key = 'MANILA_GENERATE_TEST_MOCKS' diff --git a/manila/utils.py b/manila/utils.py index 388e48cc7f..317484ee71 100644 --- a/manila/utils.py +++ b/manila/utils.py @@ -25,9 +25,7 @@ import errno import functools import hashlib import inspect -import netaddr import os -import paramiko import pyclbr import random import re @@ -43,10 +41,12 @@ from xml import sax from xml.sax import expatreader from xml.sax import saxutils -from oslo.config import cfg - from eventlet import event from eventlet import pools +import netaddr +from oslo.config import cfg +import paramiko + from manila import exception from manila.openstack.common import excutils from manila.openstack.common import importutils diff --git a/tox.ini b/tox.ini index e03e44ce46..b8508dc942 100644 --- a/tox.ini +++ b/tox.ini @@ -42,11 +42,9 @@ commands = bash tools/lintstack.sh [flake8] # TODO: These are not intentionally disabled, reenable when fixed: # H237: module is removed in Python 3 -# H305: imports not grouped correctly -# H307: like imports should be grouped together # H405: multi line docstring summary not separated with an empty line # H501: Do not use locals() for string formatting # H904: Wrap long lines in parentheses instead of a backslash -ignore = E12,E711,E712,H237,H302,H303,H304,H305,H307,H402,H404,H405,H501,H904,F +ignore = E12,E711,E712,H237,H302,H303,H304,H402,H404,H405,H501,H904,F builtins = _ exclude = .venv,.tox,dist,doc,openstack,*egg