Resolve H305 pep8 issue

H305  imports not grouped correctly

Change-Id: Ia990dd628da195097838a13d876ef987363d3f8e

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

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

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")

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

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

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

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

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'

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

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

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

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

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

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

murano/packages/mpl_package.py

@@ -14,6 +14,7 @@
 
 import os
 import sys
+
 import yaml
 
 import murano.packages.application_package

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

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

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

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

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):

murano/tests/unit/policy/test_congress_rules.py

@@ -15,6 +15,7 @@
 
 import inspect
 import os.path
+
 import unittest2 as unittest
 import yaml
 

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