From bf4f39564d265256ad5c6a820ad0f06e36fc66c6 Mon Sep 17 00:00:00 2001 From: tengqm Date: Fri, 15 May 2015 03:32:10 -0400 Subject: [PATCH] Try please flake8 for imports grouping Flake8 is now complaining about the grouping of imports. This patch try please it by moving imports around. Change-Id: I65a0ee03d8fcc78de597d06424f647e0a2d2beae --- senlinclient/common/exc.py | 4 ++-- senlinclient/common/sdk.py | 8 ++++---- senlinclient/common/utils.py | 8 ++++---- senlinclient/shell.py | 2 +- senlinclient/tests/test_utils.py | 2 +- senlinclient/v1/client.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/senlinclient/common/exc.py b/senlinclient/common/exc.py index 3b317521..1ddf69d9 100644 --- a/senlinclient/common/exc.py +++ b/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 _ diff --git a/senlinclient/common/sdk.py b/senlinclient/common/sdk.py index ef1c5901..ba6edc86 100644 --- a/senlinclient/common/sdk.py +++ b/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 diff --git a/senlinclient/common/utils.py b/senlinclient/common/utils.py index 18430099..3945cda7 100644 --- a/senlinclient/common/utils.py +++ b/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 diff --git a/senlinclient/shell.py b/senlinclient/shell.py index 146b6fe8..93a1ed10 100644 --- a/senlinclient/shell.py +++ b/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 diff --git a/senlinclient/tests/test_utils.py b/senlinclient/tests/test_utils.py index 91d66649..f4607e4c 100644 --- a/senlinclient/tests/test_utils.py +++ b/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 diff --git a/senlinclient/v1/client.py b/senlinclient/v1/client.py index ca561709..d74f6f1e 100644 --- a/senlinclient/v1/client.py +++ b/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