Merge "Try please flake8 for imports grouping"

senlinclient/common/exc.py

@@ -10,11 +10,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import six
-
 from openstack import exceptions as sdkexc
+
 from oslo_serialization import jsonutils
 from requests import exceptions as reqexc
+import six
 
 from senlinclient.common.i18n import _
 

senlinclient/common/sdk.py

@@ -11,15 +11,15 @@
 # under the License.
 
 import argparse
-import os
-
-from six.moves.urllib import parse as url_parse
-
 from openstack import connection
 from openstack import exceptions
 from openstack import resource as base
 from openstack import user_preference
 from openstack import utils
+import os
+
+from six.moves.urllib import parse as url_parse
+
 from senlinclient.common import exc
 
 # Alias here for consistency

senlinclient/common/utils.py

@@ -13,14 +13,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from heatclient.common import template_utils
+
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 import prettytable
 import six
 import yaml
 
-from oslo_serialization import jsonutils
-from oslo_utils import importutils
-
-from heatclient.common import template_utils
 from senlinclient.common import exc
 from senlinclient.common.i18n import _
 from senlinclient.openstack.common import cliutils

senlinclient/shell.py

@@ -18,11 +18,11 @@ from __future__ import print_function
 
 import argparse
 import logging
-import six
 import sys
 
 from oslo_utils import encodeutils
 from oslo_utils import importutils
+import six
 
 import senlinclient
 from senlinclient import cliargs

senlinclient/tests/test_utils.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# from senlinclient.common import exc
 from senlinclient.common import utils
+
 import testtools
 
 

senlinclient/v1/client.py

@@ -12,10 +12,10 @@
 
 import inspect
 import json
-
 from openstack.identity import identity_service
 from openstack.network.v2 import thin as thins
 from openstack import transport as trans
+
 from senlinclient.common import exc as client_exc