From 583abab35630112527e363f8188e79184858f76b Mon Sep 17 00:00:00 2001 From: "cao.yuan" Date: Thu, 18 Jul 2019 17:04:30 +0800 Subject: [PATCH] Update module import order Change-Id: Iecfdb243c120fdf19f4980ef7c2102a6e20d7b9b --- kolla_cli/api/certificate.py | 2 +- kolla_cli/commands/config.py | 4 ++-- kolla_cli/commands/exceptions.py | 1 + kolla_cli/commands/group.py | 9 ++++----- kolla_cli/commands/host.py | 11 +++++------ kolla_cli/commands/mode.py | 4 ++-- kolla_cli/commands/password.py | 4 ++-- kolla_cli/commands/property.py | 8 ++++---- kolla_cli/commands/service.py | 8 ++++---- kolla_cli/commands/support.py | 9 ++++++--- 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/kolla_cli/api/certificate.py b/kolla_cli/api/certificate.py index 4b18580..48298d2 100644 --- a/kolla_cli/api/certificate.py +++ b/kolla_cli/api/certificate.py @@ -11,11 +11,11 @@ # 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 kolla_cli.i18n as u from kolla_cli.api.job import Job from kolla_cli.common.ansible import actions from kolla_cli.common.utils import check_arg +import kolla_cli.i18n as u class CertificateApi(object): diff --git a/kolla_cli/commands/config.py b/kolla_cli/commands/config.py index b2bfcd0..32c28c6 100644 --- a/kolla_cli/commands/config.py +++ b/kolla_cli/commands/config.py @@ -11,15 +11,15 @@ # 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 logging import traceback -import kolla_cli.i18n as u - from cliff.command import Command from kolla_cli.api.client import ClientApi from kolla_cli.commands.exceptions import CommandError +import kolla_cli.i18n as u CLIENT = ClientApi() LOG = logging.getLogger(__name__) diff --git a/kolla_cli/commands/exceptions.py b/kolla_cli/commands/exceptions.py index 5744d9e..942cec4 100644 --- a/kolla_cli/commands/exceptions.py +++ b/kolla_cli/commands/exceptions.py @@ -11,6 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + """Exception definitions.""" import kolla_cli.i18n as u diff --git a/kolla_cli/commands/group.py b/kolla_cli/commands/group.py index 672e8e4..fc272ee 100644 --- a/kolla_cli/commands/group.py +++ b/kolla_cli/commands/group.py @@ -11,18 +11,17 @@ # 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 traceback -import kolla_cli.i18n as u +from cliff.command import Command +from cliff.lister import Lister from kolla_cli.api.client import ClientApi from kolla_cli.api.exceptions import ClientException from kolla_cli.commands.exceptions import CommandError from kolla_cli.common.utils import convert_lists_to_string - - -from cliff.command import Command -from cliff.lister import Lister +import kolla_cli.i18n as u CLIENT = ClientApi() diff --git a/kolla_cli/commands/host.py b/kolla_cli/commands/host.py index 670365d..8f649be 100644 --- a/kolla_cli/commands/host.py +++ b/kolla_cli/commands/host.py @@ -11,6 +11,7 @@ # 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 argparse import getpass import logging @@ -18,18 +19,16 @@ import os import traceback import yaml -import kolla_cli.i18n as u +from cliff.command import Command +from cliff.lister import Lister +from six.moves import input from kolla_cli.api.client import ClientApi from kolla_cli.api.exceptions import ClientException from kolla_cli.commands.exceptions import CommandError from kolla_cli.common.utils import convert_lists_to_string from kolla_cli.common.utils import get_setup_user - -from cliff.command import Command -from cliff.lister import Lister - -from six.moves import input +import kolla_cli.i18n as u LOG = logging.getLogger(__name__) CLIENT = ClientApi() diff --git a/kolla_cli/commands/mode.py b/kolla_cli/commands/mode.py index 4937db1..b1c38eb 100644 --- a/kolla_cli/commands/mode.py +++ b/kolla_cli/commands/mode.py @@ -15,12 +15,12 @@ import logging import traceback +from cliff.command import Command + from kolla_cli.api.client import ClientApi from kolla_cli.commands.exceptions import CommandError import kolla_cli.i18n as u -from cliff.command import Command - LOG = logging.getLogger(__name__) CLIENT = ClientApi() diff --git a/kolla_cli/commands/password.py b/kolla_cli/commands/password.py index 6e51a23..496a358 100644 --- a/kolla_cli/commands/password.py +++ b/kolla_cli/commands/password.py @@ -11,18 +11,18 @@ # 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 argparse import getpass import os import traceback -import kolla_cli.i18n as u - from cliff.command import Command from cliff.lister import Lister from kolla_cli.api.client import ClientApi from kolla_cli.commands.exceptions import CommandError +import kolla_cli.i18n as u CLIENT = ClientApi() diff --git a/kolla_cli/commands/property.py b/kolla_cli/commands/property.py index beebf5a..04a1b7d 100644 --- a/kolla_cli/commands/property.py +++ b/kolla_cli/commands/property.py @@ -11,16 +11,16 @@ # 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 traceback -import kolla_cli.i18n as u +from cliff.command import Command +from cliff.lister import Lister from kolla_cli.api.client import ClientApi from kolla_cli.commands.exceptions import CommandError from kolla_cli.common import utils - -from cliff.command import Command -from cliff.lister import Lister +import kolla_cli.i18n as u CLIENT = ClientApi() diff --git a/kolla_cli/commands/service.py b/kolla_cli/commands/service.py index 6dcfaa3..59bcd6b 100644 --- a/kolla_cli/commands/service.py +++ b/kolla_cli/commands/service.py @@ -11,17 +11,17 @@ # 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 traceback -import kolla_cli.i18n as u +from cliff.command import Command +from cliff.lister import Lister from kolla_cli.api.client import ClientApi from kolla_cli.api.exceptions import ClientException from kolla_cli.commands.exceptions import CommandError from kolla_cli.common.utils import convert_lists_to_string - -from cliff.command import Command -from cliff.lister import Lister +import kolla_cli.i18n as u CLIENT = ClientApi() diff --git a/kolla_cli/commands/support.py b/kolla_cli/commands/support.py index 6abe6d4..1483dab 100644 --- a/kolla_cli/commands/support.py +++ b/kolla_cli/commands/support.py @@ -11,13 +11,16 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from cliff.command import Command -from kolla_cli.api.client import ClientApi -import kolla_cli.i18n as u + import logging import tempfile import traceback +from cliff.command import Command + +from kolla_cli.api.client import ClientApi +import kolla_cli.i18n as u + LOG = logging.getLogger(__name__) CLIENT = ClientApi()