diff --git a/ironic/api/middleware/parsable_error.py b/ironic/api/middleware/parsable_error.py index 4ca5175272..1b86e14ff8 100644 --- a/ironic/api/middleware/parsable_error.py +++ b/ironic/api/middleware/parsable_error.py @@ -23,9 +23,10 @@ Based on pecan.middleware.errordocument """ import json -import webob from xml import etree as et +import webob + from ironic.common.i18n import _ from ironic.common.i18n import _LE from ironic.openstack.common import log diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 14c5dbdb3e..8a4f4a5668 100644 --- a/ironic/cmd/api.py +++ b/ironic/cmd/api.py @@ -19,10 +19,10 @@ import logging import sys +from wsgiref import simple_server from oslo.config import cfg from six.moves import socketserver -from wsgiref import simple_server from ironic.api import app from ironic.common.i18n import _LI diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py index 6ffa8fe23d..69b2e781a9 100644 --- a/ironic/common/driver_factory.py +++ b/ironic/common/driver_factory.py @@ -14,12 +14,12 @@ # under the License. from oslo.config import cfg +from stevedore import dispatch from ironic.common import exception from ironic.common.i18n import _LI from ironic.openstack.common import lockutils from ironic.openstack.common import log -from stevedore import dispatch LOG = log.getLogger(__name__) diff --git a/ironic/tests/api/test_hooks.py b/ironic/tests/api/test_hooks.py index 6ca18eef35..a0c6f6987e 100644 --- a/ironic/tests/api/test_hooks.py +++ b/ironic/tests/api/test_hooks.py @@ -15,6 +15,7 @@ """Tests for the Pecan API hooks.""" import json + import mock from oslo.config import cfg from oslo import messaging diff --git a/ironic/tests/api/v1/test_drivers.py b/ironic/tests/api/v1/test_drivers.py index 9fa512cc59..fc078501b8 100644 --- a/ironic/tests/api/v1/test_drivers.py +++ b/ironic/tests/api/v1/test_drivers.py @@ -14,6 +14,7 @@ # under the License. import json + import mock from testtools.matchers import HasLength diff --git a/ironic/tests/conductor/utils.py b/ironic/tests/conductor/utils.py index 1b873fc8e7..5a23b199d5 100644 --- a/ironic/tests/conductor/utils.py +++ b/ironic/tests/conductor/utils.py @@ -17,10 +17,11 @@ """Test utils for Ironic Managers.""" -from ironic.common import driver_factory import pkg_resources from stevedore import dispatch +from ironic.common import driver_factory + def mock_the_extension_manager(driver="fake", namespace="ironic.drivers"): """Get a fake stevedore NameDispatchExtensionManager instance. diff --git a/ironic/tests/drivers/drac/test_client.py b/ironic/tests/drivers/drac/test_client.py index e6d8e165ee..3f16089535 100644 --- a/ironic/tests/drivers/drac/test_client.py +++ b/ironic/tests/drivers/drac/test_client.py @@ -15,9 +15,10 @@ Test class for DRAC client wrapper. """ -import mock from xml.etree import ElementTree +import mock + from ironic.common import exception from ironic.drivers.modules.drac import client as drac_client from ironic.tests import base diff --git a/ironic/tests/drivers/ilo/test_common.py b/ironic/tests/drivers/ilo/test_common.py index d4ec8e839c..67c806b2ef 100644 --- a/ironic/tests/drivers/ilo/test_common.py +++ b/ironic/tests/drivers/ilo/test_common.py @@ -15,9 +15,9 @@ """Test class for common methods used by iLO modules.""" -import mock import tempfile +import mock from oslo.config import cfg from oslo.utils import importutils diff --git a/ironic/tests/drivers/ilo/test_deploy.py b/ironic/tests/drivers/ilo/test_deploy.py index 632c9de985..629c3c8823 100644 --- a/ironic/tests/drivers/ilo/test_deploy.py +++ b/ironic/tests/drivers/ilo/test_deploy.py @@ -15,9 +15,9 @@ """Test class for common methods used by iLO modules.""" -import mock import tempfile +import mock from oslo.config import cfg from ironic.common import exception diff --git a/ironic/tests/drivers/test_console_utils.py b/ironic/tests/drivers/test_console_utils.py index 9c10b0329e..95de1529e9 100644 --- a/ironic/tests/drivers/test_console_utils.py +++ b/ironic/tests/drivers/test_console_utils.py @@ -17,13 +17,13 @@ """Test class for console_utils driver module.""" -import mock import os import random import string import subprocess import tempfile +import mock from oslo.config import cfg from ironic.common import exception diff --git a/ironic/tests/drivers/test_deploy_utils.py b/ironic/tests/drivers/test_deploy_utils.py index db81dd0e0a..2918d6a7a5 100644 --- a/ironic/tests/drivers/test_deploy_utils.py +++ b/ironic/tests/drivers/test_deploy_utils.py @@ -14,11 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. -import fixtures -import mock import os import tempfile +import fixtures +import mock from oslo.config import cfg from ironic.common import disk_partitioner diff --git a/ironic/tests/drivers/test_image_cache.py b/ironic/tests/drivers/test_image_cache.py index 0849b82859..fa79fd5180 100644 --- a/ironic/tests/drivers/test_image_cache.py +++ b/ironic/tests/drivers/test_image_cache.py @@ -16,11 +16,12 @@ """Tests for ImageCache class and helper functions.""" -import mock import os import tempfile import time +import mock + from ironic.common import exception from ironic.common import image_service from ironic.common import images diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py index 7babdd33cd..c3573bbe55 100644 --- a/ironic/tests/drivers/test_ipmitool.py +++ b/ironic/tests/drivers/test_ipmitool.py @@ -19,12 +19,12 @@ """Test class for IPMITool driver module.""" -import mock import os import stat import tempfile import time +import mock from oslo.config import cfg from ironic.common import boot_devices diff --git a/ironic/tests/drivers/test_iscsi_deploy.py b/ironic/tests/drivers/test_iscsi_deploy.py index e6eb8df6d4..8fceff675b 100644 --- a/ironic/tests/drivers/test_iscsi_deploy.py +++ b/ironic/tests/drivers/test_iscsi_deploy.py @@ -15,10 +15,10 @@ """Test class for iSCSI deploy mechanism.""" -import mock import os import tempfile +import mock from oslo.config import cfg from ironic.common import exception diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py index c3eea4dd57..1cf2fde7ba 100644 --- a/ironic/tests/drivers/test_pxe.py +++ b/ironic/tests/drivers/test_pxe.py @@ -17,11 +17,11 @@ """Test class for PXE driver.""" -import fixtures -import mock import os import tempfile +import fixtures +import mock from oslo.config import cfg from oslo.serialization import jsonutils as json diff --git a/ironic/tests/test_images.py b/ironic/tests/test_images.py index df0d897827..5a84233ce6 100644 --- a/ironic/tests/test_images.py +++ b/ironic/tests/test_images.py @@ -16,10 +16,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import os import shutil +import mock from oslo.config import cfg import six.moves.builtins as __builtin__ diff --git a/ironic/tests/test_swift.py b/ironic/tests/test_swift.py index 7852a1dc8b..c432e578c4 100644 --- a/ironic/tests/test_swift.py +++ b/ironic/tests/test_swift.py @@ -13,9 +13,9 @@ # under the License. import __builtin__ -import mock import sys +import mock from oslo.config import cfg from swiftclient import client as swift_client from swiftclient import exceptions as swift_exception diff --git a/tox.ini b/tox.ini index 9b864a96b9..2c7e2df291 100644 --- a/tox.ini +++ b/tox.ini @@ -47,7 +47,7 @@ commands = {posargs} [flake8] # E711: ignored because it is normal to use "column == None" in sqlalchemy # TODO(yuriyz): Analyze or fix the warnings blacklisted below -ignore = E12,E111,E113,E131,E265,E711,F812,H305 +ignore = E12,E111,E113,E131,E265,E711,F812 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,*ironic/nova* [hacking]