From 87a63bf24e85f8c7104dcb0ca385af8d6b9b5fe0 Mon Sep 17 00:00:00 2001 From: Ekaterina Chernova Date: Wed, 4 Feb 2015 17:10:06 +0300 Subject: [PATCH] Resolve H305 pep8 issue H305 imports not grouped correctly Change-Id: Ia990dd628da195097838a13d876ef987363d3f8e --- murano/api/v1/catalog.py | 2 +- murano/cmd/api.py | 4 +++- murano/common/messaging/message.py | 1 + murano/common/policy.py | 5 +++-- murano/common/statservice.py | 7 ++++--- murano/common/wsgi.py | 11 +++++------ .../alembic_migrations/versions/001_inital_version.py | 3 ++- .../versions/004_change_package_desc_type.py | 2 +- murano/engine/system/agent.py | 2 +- murano/engine/system/mistralclient.py | 4 +++- murano/engine/system/resource_manager.py | 1 + murano/engine/system/yaql_functions.py | 2 +- murano/packages/hot_package.py | 1 + murano/packages/load_utils.py | 3 ++- murano/packages/mpl_package.py | 1 + murano/tests/unit/api/base.py | 5 +++-- murano/tests/unit/api/v1/test_catalog.py | 3 ++- murano/tests/unit/api/v1/test_environments.py | 1 + murano/tests/unit/dsl/foundation/test_class_loader.py | 1 + murano/tests/unit/packages/versions/test_hot_v1.py | 5 ++++- murano/tests/unit/policy/test_congress_rules.py | 1 + tox.ini | 3 +-- 22 files changed, 43 insertions(+), 25 deletions(-) diff --git a/murano/api/v1/catalog.py b/murano/api/v1/catalog.py index cdad01d8..8caa228c 100644 --- a/murano/api/v1/catalog.py +++ b/murano/api/v1/catalog.py @@ -14,10 +14,10 @@ # under the License. import cgi -import jsonschema import os import tempfile +import jsonschema from oslo.config import cfg from oslo.db import exception as db_exc from webob import exc diff --git a/murano/cmd/api.py b/murano/cmd/api.py index 3721f8d6..93822bf6 100644 --- a/murano/cmd/api.py +++ b/murano/cmd/api.py @@ -14,10 +14,12 @@ # License for the specific language governing permissions and limitations # under the License. -import eventlet + import os import sys +import eventlet + if os.name == 'nt': # eventlet monkey patching causes subprocess.Popen to fail on Windows # when using pipes due to missing non blocking I/O support diff --git a/murano/common/messaging/message.py b/murano/common/messaging/message.py index f26d38dc..9b026a2b 100644 --- a/murano/common/messaging/message.py +++ b/murano/common/messaging/message.py @@ -14,6 +14,7 @@ # limitations under the License. import logging + from oslo.serialization import jsonutils log = logging.getLogger("murano-common.messaging") diff --git a/murano/common/policy.py b/murano/common/policy.py index dde0fa97..9ea2b49a 100644 --- a/murano/common/policy.py +++ b/murano/common/policy.py @@ -14,11 +14,12 @@ # Based on designate/policy.py -import murano.openstack.common.log as logging -from murano.openstack.common import policy from oslo.config import cfg from webob import exc as exceptions +import murano.openstack.common.log as logging +from murano.openstack.common import policy + LOG = logging.getLogger(__name__) CONF = cfg.CONF diff --git a/murano/common/statservice.py b/murano/common/statservice.py index b526f0d9..07d742db 100644 --- a/murano/common/statservice.py +++ b/murano/common/statservice.py @@ -12,16 +12,17 @@ # License for the specific language governing permissions and limitations # under the License. -import eventlet + import json -import psutil import socket import time +import eventlet +import psutil + from murano.api import v1 from murano.api.v1 import request_statistics from murano.common import config - from murano.db.services import stats as db_stats from murano.openstack.common.gettextutils import _ from murano.openstack.common import log as logging diff --git a/murano/common/wsgi.py b/murano/common/wsgi.py index 90c35499..40a136ad 100644 --- a/murano/common/wsgi.py +++ b/murano/common/wsgi.py @@ -15,26 +15,25 @@ """Utility methods for working with WSGI servers.""" -import eventlet -eventlet.patcher.monkey_patch(all=False, socket=True) - import datetime import errno -import jsonschema import re import socket import sys import time +from xml.dom import minidom +from xml.parsers import expat +import eventlet +eventlet.patcher.monkey_patch(all=False, socket=True) import eventlet.wsgi +import jsonschema from oslo.config import cfg from oslo.serialization import jsonutils import routes import routes.middleware import webob.dec import webob.exc -from xml.dom import minidom -from xml.parsers import expat from murano.api.v1 import schemas from murano.common import xmlutils diff --git a/murano/db/migration/alembic_migrations/versions/001_inital_version.py b/murano/db/migration/alembic_migrations/versions/001_inital_version.py index 3076e3fe..274a7845 100644 --- a/murano/db/migration/alembic_migrations/versions/001_inital_version.py +++ b/murano/db/migration/alembic_migrations/versions/001_inital_version.py @@ -23,11 +23,12 @@ Create Date: 2014-05-29 16:32:33.698760 revision = '001' down_revision = None +import uuid + from alembic import op from oslo.utils import timeutils import sqlalchemy as sa from sqlalchemy.sql.expression import table as sa_table -import uuid from murano.common import consts from murano.db.sqla import types as st diff --git a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py index 9e46282e..8e5f49e7 100644 --- a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py +++ b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py @@ -24,10 +24,10 @@ revision = '004' down_revision = '003' from alembic import op -from murano.db.sqla import types as st import sqlalchemy as sa import murano.db.migration.helpers as helpers +from murano.db.sqla import types as st MYSQL_ENGINE = 'InnoDB' MYSQL_CHARSET = 'utf8' diff --git a/murano/engine/system/agent.py b/murano/engine/system/agent.py index 3d5fd266..17e22e97 100644 --- a/murano/engine/system/agent.py +++ b/murano/engine/system/agent.py @@ -15,12 +15,12 @@ import copy import datetime +import logging import os import types import uuid import eventlet.event -import logging import murano.common.config as config import murano.common.messaging as messaging diff --git a/murano/engine/system/mistralclient.py b/murano/engine/system/mistralclient.py index d4eeb88e..60d41dd9 100644 --- a/murano/engine/system/mistralclient.py +++ b/murano/engine/system/mistralclient.py @@ -13,9 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import eventlet + import json +import eventlet + import murano.dsl.helpers as helpers import murano.dsl.murano_class as murano_class import murano.dsl.murano_object as murano_object diff --git a/murano/engine/system/resource_manager.py b/murano/engine/system/resource_manager.py index 1752dd6a..e4b84d60 100644 --- a/murano/engine/system/resource_manager.py +++ b/murano/engine/system/resource_manager.py @@ -14,6 +14,7 @@ # limitations under the License. import json as jsonlib + import yaml as yamllib import murano.dsl.helpers as helpers diff --git a/murano/engine/system/yaql_functions.py b/murano/engine/system/yaql_functions.py index 9a292e48..b0fe105a 100644 --- a/murano/engine/system/yaql_functions.py +++ b/murano/engine/system/yaql_functions.py @@ -15,13 +15,13 @@ import base64 import collections +import itertools import random import re import string import time import types -import itertools import jsonpatch import jsonpointer import yaql.context diff --git a/murano/packages/hot_package.py b/murano/packages/hot_package.py index 6076aaaa..954dac69 100644 --- a/murano/packages/hot_package.py +++ b/murano/packages/hot_package.py @@ -16,6 +16,7 @@ import os import shutil import sys import types + import yaml from murano.dsl import yaql_expression diff --git a/murano/packages/load_utils.py b/murano/packages/load_utils.py index 5ce2b75a..a9142352 100644 --- a/murano/packages/load_utils.py +++ b/murano/packages/load_utils.py @@ -16,9 +16,10 @@ import os import shutil import sys import tempfile -import yaml import zipfile +import yaml + from murano.engine import yaql_yaml_loader import murano.packages.application_package import murano.packages.exceptions as e diff --git a/murano/packages/mpl_package.py b/murano/packages/mpl_package.py index 4258503d..9a5a64b7 100644 --- a/murano/packages/mpl_package.py +++ b/murano/packages/mpl_package.py @@ -14,6 +14,7 @@ import os import sys + import yaml import murano.packages.application_package diff --git a/murano/tests/unit/api/base.py b/murano/tests/unit/api/base.py index 5083ec39..1987ce5d 100644 --- a/murano/tests/unit/api/base.py +++ b/murano/tests/unit/api/base.py @@ -13,12 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import fixtures import logging +import urllib + +import fixtures import mock from oslo.utils import timeutils import routes -import urllib import webob from murano.api.v1 import request_statistics diff --git a/murano/tests/unit/api/v1/test_catalog.py b/murano/tests/unit/api/v1/test_catalog.py index ed63ca37..07844954 100644 --- a/murano/tests/unit/api/v1/test_catalog.py +++ b/murano/tests/unit/api/v1/test_catalog.py @@ -16,9 +16,10 @@ import cgi import cStringIO import imghdr -import mock import os +import mock + from murano.api.v1 import catalog from murano.common import policy from murano.db.catalog import api as db_catalog_api diff --git a/murano/tests/unit/api/v1/test_environments.py b/murano/tests/unit/api/v1/test_environments.py index 18d57bab..e7e0b469 100644 --- a/murano/tests/unit/api/v1/test_environments.py +++ b/murano/tests/unit/api/v1/test_environments.py @@ -14,6 +14,7 @@ # limitations under the License. import json + from oslo.utils import timeutils from murano.api.v1 import environments diff --git a/murano/tests/unit/dsl/foundation/test_class_loader.py b/murano/tests/unit/dsl/foundation/test_class_loader.py index ff07f7d0..52cb377f 100644 --- a/murano/tests/unit/dsl/foundation/test_class_loader.py +++ b/murano/tests/unit/dsl/foundation/test_class_loader.py @@ -14,6 +14,7 @@ import fnmatch import os.path + import yaml from murano.dsl import class_loader diff --git a/murano/tests/unit/packages/versions/test_hot_v1.py b/murano/tests/unit/packages/versions/test_hot_v1.py index 571e38ea..46e70401 100644 --- a/murano/tests/unit/packages/versions/test_hot_v1.py +++ b/murano/tests/unit/packages/versions/test_hot_v1.py @@ -10,10 +10,13 @@ # 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 imghdr +import os + import murano.packages.load_utils as load_utils import murano.tests.unit.base as test_base -import os class TestHotV1(test_base.MuranoTestCase): diff --git a/murano/tests/unit/policy/test_congress_rules.py b/murano/tests/unit/policy/test_congress_rules.py index 479260fa..d0d18698 100644 --- a/murano/tests/unit/policy/test_congress_rules.py +++ b/murano/tests/unit/policy/test_congress_rules.py @@ -15,6 +15,7 @@ import inspect import os.path + import unittest2 as unittest import yaml diff --git a/tox.ini b/tox.ini index 19da3b36..9f997bbd 100644 --- a/tox.ini +++ b/tox.ini @@ -40,13 +40,12 @@ commands = oslo-config-generator --config-file etc/oslo-config-generator/murano. [flake8] # H233 Python 3.x incompatible use of print operator # E265 block comment should start with '# ' -# H305 imports not grouped correctly # H307 like imports should be grouped together # H405 Multi line docstring summary not separated with an empty line # H702 Argument to _ must be just a string # H904 Wrap long lines in parentheses instead of a backslash -ignore = H233,H305,H307,E265,H405,H702,H904 +ignore = H233,H307,E265,H405,H702,H904 show-source = true builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools