summaryrefslogtreecommitdiff
path: root/heatclient/common
diff options
context:
space:
mode:
authorshizhihui <zhihui.shi@easystack.cn>2016-07-28 12:25:39 +0800
committershizhihui <zhihui.shi@easystack.cn>2016-08-03 19:45:05 +0800
commit5dbbc102ebbeb4f6a007ac7dfc119cd7c4d436b8 (patch)
tree759a461f2d494271763e704ab1cdfcb6ab1cbb9a /heatclient/common
parentd930e33cf4bcc9a870117eb00a19b3f5b4448b24 (diff)
downloadpython-heatclient-5dbbc102ebbeb4f6a007ac7dfc119cd7c4d436b8.tar.gz
Standardize import format
According to the rule in http://docs.openstack.org/developer/hacking/#imports I modify some irregular import format in heatclinet. Change-Id: I0200ddad88ee833d7de9d6df2c1519e4f4560db7
Diffstat (limited to 'heatclient/common')
-rw-r--r--heatclient/common/deployment_utils.py3
-rw-r--r--heatclient/common/environment_format.py4
-rw-r--r--heatclient/common/event_utils.py1
-rw-r--r--heatclient/common/format_utils.py3
-rw-r--r--heatclient/common/hook_utils.py1
5 files changed, 6 insertions, 6 deletions
diff --git a/heatclient/common/deployment_utils.py b/heatclient/common/deployment_utils.py
index e6d68f8..adb1769 100644
--- a/heatclient/common/deployment_utils.py
+++ b/heatclient/common/deployment_utils.py
@@ -11,11 +11,12 @@
# under the License.
import copy
+import uuid
+
import six
from six.moves.urllib import parse as urlparse
from swiftclient import client as sc
from swiftclient import utils as swiftclient_utils
-import uuid
from heatclient import exc
from heatclient.openstack.common._i18n import _
diff --git a/heatclient/common/environment_format.py b/heatclient/common/environment_format.py
index 179a205..6870b79 100644
--- a/heatclient/common/environment_format.py
+++ b/heatclient/common/environment_format.py
@@ -10,11 +10,11 @@
# License for the specific language governing permissions and limitations
# under the License.
+import yaml
+
from heatclient.common import template_format
from heatclient.openstack.common._i18n import _
-import yaml
-
SECTIONS = (
PARAMETER_DEFAULTS, PARAMETERS, RESOURCE_REGISTRY, EVENT_SINKS
diff --git a/heatclient/common/event_utils.py b/heatclient/common/event_utils.py
index d490ecf..18a0b98 100644
--- a/heatclient/common/event_utils.py
+++ b/heatclient/common/event_utils.py
@@ -17,7 +17,6 @@ import time
from heatclient.common import utils
import heatclient.exc as exc
-
from heatclient.openstack.common._i18n import _
diff --git a/heatclient/common/format_utils.py b/heatclient/common/format_utils.py
index 0202b6c..d1a9206 100644
--- a/heatclient/common/format_utils.py
+++ b/heatclient/common/format_utils.py
@@ -12,9 +12,10 @@
#
# Copyright 2015 IBM Corp.
+import sys
+
from osc_lib.command import command
import six
-import sys
class RawFormat(command.ShowOne):
diff --git a/heatclient/common/hook_utils.py b/heatclient/common/hook_utils.py
index e8d4850..39fedb5 100644
--- a/heatclient/common/hook_utils.py
+++ b/heatclient/common/hook_utils.py
@@ -15,7 +15,6 @@ import logging
from oslo_utils import fnmatch
import heatclient.exc as exc
-
from heatclient.openstack.common._i18n import _
from heatclient.openstack.common._i18n import _LE