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

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 _

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

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 _
 
 

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

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
 

heatclient/osc/v1/build_info.py

@@ -14,10 +14,10 @@
 """Orchestration v1 build info action implementations"""
 
 import logging
-import six
 
 from osc_lib.command import command
 from osc_lib import utils
+import six
 
 from heatclient.common import utils as heat_utils
 

heatclient/osc/v1/resource.py

@@ -14,14 +14,14 @@
 """Orchestration v1 Stack action implementations"""
 
 import logging
-import six
-from six.moves.urllib import request
 
 from osc_lib.command import command
 from osc_lib import exceptions as exc
 from osc_lib.i18n import _
 from osc_lib import utils
 from oslo_serialization import jsonutils
+import six
+from six.moves.urllib import request
 
 from heatclient.common import format_utils
 from heatclient.common import utils as heat_utils

heatclient/osc/v1/resource_type.py

@@ -14,14 +14,15 @@
 """Orchestration v1 resource type implementations"""
 
 import logging
+
+from osc_lib.command import command
+from osc_lib import exceptions as exc
+from osc_lib.i18n import _
 import six
 
 from heatclient.common import format_utils
 from heatclient.common import utils as heat_utils
 from heatclient import exc as heat_exc
-from osc_lib.command import command
-from osc_lib import exceptions as exc
-from osc_lib.i18n import _
 
 
 class ResourceTypeShow(format_utils.YamlFormat):

heatclient/osc/v1/snapshot.py

@@ -14,12 +14,12 @@
 """Orchestration v1 Stack Snapshot implementations."""
 
 import logging
-import six
 
 from osc_lib.command import command
 from osc_lib import exceptions as exc
 from osc_lib.i18n import _
 from osc_lib import utils
+import six
 
 from heatclient.common import format_utils
 from heatclient import exc as heat_exc

heatclient/osc/v1/software_config.py

@@ -14,14 +14,13 @@
 """Orchestration v1 software config action implementations"""
 
 import logging
-import six
-
-from six.moves.urllib import request
-import yaml
 
 from osc_lib.command import command
 from osc_lib import exceptions as exc
 from osc_lib import utils
+import six
+from six.moves.urllib import request
+import yaml
 
 from heatclient.common import format_utils
 from heatclient.common import template_format

heatclient/osc/v1/software_deployment.py

@@ -14,11 +14,11 @@
 """Orchestration v1 Software Deployment action implementations"""
 
 import logging
-from oslo_serialization import jsonutils
 
 from osc_lib.command import command
 from osc_lib import exceptions as exc
 from osc_lib import utils
+from oslo_serialization import jsonutils
 
 from heatclient.common import deployment_utils
 from heatclient.common import format_utils

heatclient/osc/v1/template.py

@@ -13,11 +13,10 @@
 #   Copyright 2015 IBM Corp.
 
 import logging
-import six
-
 
 from osc_lib.command import command
 from osc_lib import utils
+import six
 
 from heatclient.common import format_utils
 from heatclient.common import http

heatclient/tests/functional/osc/v1/base.py

@@ -11,8 +11,8 @@
 #    under the License.
 
 import os
-import six
 
+import six
 from tempest.lib.cli import base
 from tempest.lib.cli import output_parser
 

heatclient/tests/functional/osc/v1/test_stack.py

@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from tempest.lib.common.utils import data_utils as utils
 
 from heatclient.tests.functional.osc.v1 import base
-from tempest.lib.common.utils import data_utils as utils
 
 
 class OpenStackClientStackTest(base.OpenStackClientTestBase):

heatclient/tests/unit/osc/v1/test_event.py

@@ -13,6 +13,7 @@
 #   Copyright 2015 IBM Corp.
 
 import copy
+
 import mock
 import testscenarios
 

heatclient/tests/unit/osc/v1/test_resource.py

@@ -12,8 +12,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc

heatclient/tests/unit/osc/v1/test_software_config.py

@@ -12,9 +12,8 @@
 #
 
 import mock
-import yaml
-
 from osc_lib import exceptions as exc
+import yaml
 
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import software_config

heatclient/tests/unit/osc/v1/test_software_deployment.py

@@ -12,8 +12,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc

heatclient/tests/unit/osc/v1/test_stack.py

@@ -13,14 +13,14 @@
 
 import copy
 import io
+
 import mock
+from osc_lib import exceptions as exc
+from osc_lib import utils
 import six
 import testscenarios
 import yaml
 
-from osc_lib import exceptions as exc
-from osc_lib import utils
-
 from heatclient.common import template_format
 from heatclient import exc as heat_exc
 from heatclient.osc.v1 import stack

heatclient/tests/unit/test_actions.py

@@ -11,11 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import testtools
+
 from heatclient.tests.unit import fakes
 from heatclient.v1 import actions
 
-import testtools
-
 
 class ActionManagerTest(testtools.TestCase):
 

heatclient/tests/unit/test_build_info.py

@@ -12,6 +12,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 mock
 from oslo_serialization import jsonutils
 import testtools

heatclient/tests/unit/test_common_http.py

@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import logging
-import mock
 import os
 import socket
 
 from keystoneauth1 import adapter
+import mock
 from mox3 import mox
 from oslo_serialization import jsonutils
 import requests

heatclient/tests/unit/test_deployment_utils.py

@@ -16,11 +16,11 @@ import six
 import swiftclient.client
 import testscenarios
 import testtools
+from testtools import matchers
 
 from heatclient.common import deployment_utils
 from heatclient import exc
 from heatclient.v1 import software_configs
-from testtools import matchers
 
 
 load_tests = testscenarios.load_tests_apply_scenarios

heatclient/tests/unit/test_environment_format.py

@@ -10,14 +10,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heatclient.common import environment_format
-
 import mock
 import six
 import testscenarios
 import testtools
 import yaml
 
+from heatclient.common import environment_format
 
 load_tests = testscenarios.load_tests_apply_scenarios
 

heatclient/tests/unit/test_events.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heatclient.common import utils
-from heatclient.v1 import events
-
 import mock
 from mox3 import mox
 import testtools
 
+from heatclient.common import utils
+from heatclient.v1 import events
+
 
 class EventManagerTest(testtools.TestCase):
 

heatclient/tests/unit/test_resource_formatter.py

@@ -13,6 +13,7 @@
 
 import json
 import os
+
 import six
 
 from heatclient.common import resource_formatter

heatclient/tests/unit/test_resource_types.py

@@ -10,6 +10,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 mock
 import testtools
 

heatclient/tests/unit/test_resources.py

@@ -11,14 +11,14 @@
 #    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 heatclient.common import utils
-
-from heatclient.v1 import resources
-from six.moves.urllib import parse
 
 from mox3 import mox
+from six.moves.urllib import parse
 import testtools
 
+from heatclient.common import utils
+from heatclient.v1 import resources
+
 
 class ResourceManagerTest(testtools.TestCase):
 

heatclient/tests/unit/test_service.py

@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from heatclient import exc
 import testtools
 
-
+from heatclient import exc
 from heatclient.v1 import services
 
 

heatclient/tests/unit/test_shell.py

@@ -11,28 +11,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import fixtures
-import mock
 import os
+import sys
+import tempfile
+import uuid
+
+import fixtures
+from keystoneauth1 import fixture as keystone_fixture
+import mock
+from mox3 import mox
+from oslo_serialization import jsonutils
+from oslo_utils import encodeutils
 from oslotest import mockpatch
 import requests
+from requests_mock.contrib import fixture as rm_fixture
 import six
 from six.moves.urllib import parse
 from six.moves.urllib import request
-import sys
-import tempfile
 import testscenarios
 import testtools
-import uuid
 import yaml
 
-from keystoneauth1 import fixture as keystone_fixture
-from oslo_serialization import jsonutils
-from oslo_utils import encodeutils
-from requests_mock.contrib import fixture as rm_fixture
-
-from mox3 import mox
-
 from heatclient.common import http
 from heatclient.common import utils
 from heatclient import exc

heatclient/tests/unit/test_stacks.py

@@ -9,13 +9,14 @@
 #    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 heatclient.v1 import stacks
 
 import mock
 import testscenarios
 from testscenarios import scenarios as scnrs
 import testtools
 
+from heatclient.v1 import stacks
+
 load_tests = testscenarios.load_tests_apply_scenarios
 
 

heatclient/tests/unit/test_template_utils.py

@@ -13,11 +13,12 @@
 
 import base64
 import json
+import tempfile
+
 from mox3 import mox
 import six
 from six.moves.urllib import error
 from six.moves.urllib import request
-import tempfile
 import testtools
 from testtools import matchers
 import yaml

heatclient/tests/unit/test_utils.py

@@ -12,12 +12,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 os
+
+import mock
+import testtools
+
 from heatclient.common import utils
 from heatclient import exc
 from heatclient.v1 import resources as hc_res
-import mock
-import os
-import testtools
 
 
 class ShellTest(testtools.TestCase):

heatclient/tests/unit/v1/test_hooks.py

@@ -14,9 +14,8 @@
 import mock
 import testtools
 
-import heatclient.v1.shell as shell
-
 from heatclient.common import hook_utils
+import heatclient.v1.shell as shell
 
 
 class TestHooks(testtools.TestCase):

heatclient/v1/resource_types.py

@@ -11,13 +11,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import six
-
-from heatclient.common import utils
-
 from oslo_utils import encodeutils
+import six
 from six.moves.urllib import parse
 
+from heatclient.common import utils
 from heatclient.openstack.common.apiclient import base
 
 

heatclient/v1/resources.py

@@ -12,12 +12,12 @@
 #    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 heatclient.common import utils
 
 from oslo_utils import encodeutils
 import six
 from six.moves.urllib import parse
 
+from heatclient.common import utils
 from heatclient.openstack.common.apiclient import base
 from heatclient.v1 import stacks
 

heatclient/v1/shell.py

@@ -14,12 +14,12 @@
 #    under the License.
 
 import logging
+import sys
 
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
 import six
 from six.moves.urllib import request
-import sys
 import yaml
 
 from heatclient.common import deployment_utils
@@ -29,13 +29,11 @@ from heatclient.common import http
 from heatclient.common import template_format
 from heatclient.common import template_utils
 from heatclient.common import utils
-
+import heatclient.exc as exc
 from heatclient.openstack.common._i18n import _
 from heatclient.openstack.common._i18n import _LI
 from heatclient.openstack.common._i18n import _LW
 
-import heatclient.exc as exc
-
 logger = logging.getLogger(__name__)
 
 

heatclient/v1/stacks.py

@@ -12,11 +12,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.
-from heatclient.common import utils
 
 import six
 from six.moves.urllib import parse
 
+from heatclient.common import utils
 from heatclient import exc
 from heatclient.openstack.common._i18n import _
 from heatclient.openstack.common.apiclient import base