Fix module's import order

Made corrections in import order for built-in,third-party
and project specific modules as per openstack import
standards [1].

[1] http://docs.openstack.org/developer/hacking/#import-order-template

Change-Id: I1e086ab187aaf31868fcce76917070bb9a95e870

muranoclient/common/utils.py

@@ -16,6 +16,7 @@
 from __future__ import print_function
 
 import collections
+import json
 import os
 import re
 import shutil
@@ -26,7 +27,6 @@ import uuid
 import warnings
 import zipfile
 
-import json
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils

muranoclient/common/yaqlexpression.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import re
-import six
 
+import six
 import yaql
 from yaql.language import exceptions as yaql_exc
 

muranoclient/glance/__init__.py

@@ -11,9 +11,9 @@
 # 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 six
 
 from glanceclient import exc
+import six
 
 
 class ArtifactType(object):

muranoclient/glance/artifacts.py

@@ -12,12 +12,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from glanceclient.common import utils
+from glanceclient import exc
 from oslo_utils import encodeutils
 import six
 from six.moves.urllib import parse
 
-from glanceclient.common import utils
-from glanceclient import exc
 from muranoclient.glance import ArtifactType
 
 

muranoclient/glance/client.py

@@ -12,9 +12,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
 from glanceclient.common import http
 from glanceclient.common import utils
+
 from muranoclient.glance import artifacts
 
 

muranoclient/openstack/common/apiclient/base.py

@@ -31,8 +31,8 @@ from oslo_utils import uuidutils
 import six
 from six.moves.urllib import parse
 
-from muranoclient.openstack.common.apiclient import exceptions
 from muranoclient.i18n import _
+from muranoclient.openstack.common.apiclient import exceptions
 
 
 def getid(obj):

muranoclient/openstack/common/apiclient/client.py

@@ -25,20 +25,20 @@ OpenStack Client interface. Handles the REST calls and responses.
 # E0202: An attribute inherited from %s hide this method
 # pylint: disable=E0202
 
-import time
-
 try:
     import simplejson as json
 except ImportError:
     import json
 
-import requests
+import time
 
 from oslo_log import log as logging
 from oslo_utils import importutils
+import requests
 
-from muranoclient.openstack.common.apiclient import exceptions
 from muranoclient.i18n import _
+from muranoclient.openstack.common.apiclient import exceptions
+
 
 
 _logger = logging.getLogger(__name__)

muranoclient/tests/functional/cli/murano_test_utils.py

@@ -22,11 +22,11 @@ import time
 import uuid
 
 from six.moves import SimpleHTTPServer
+from tempest_lib.cli import output_parser
+from tempest_lib import exceptions
 
 from muranoclient.tests.functional.cli import utils
 from muranoclient.tests.functional import muranoclient
-from tempest_lib.cli import output_parser
-from tempest_lib import exceptions
 
 
 class CLIUtilsTestBase(muranoclient.ClientTestBase):

muranoclient/tests/functional/cli/utils.py

@@ -13,9 +13,11 @@
 # under the License.
 
 import os
-import yaml
 import zipfile
 
+import yaml
+
+
 MANIFEST = {'Format': 'MuranoPL/1.0',
             'Type': 'Application',
             'Description': 'MockApp for CLI tests',

muranoclient/v1/artifact_packages.py

@@ -12,11 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from glanceclient import exc as glance_exc
 import six
 import yaml
 
-from glanceclient import exc as glance_exc
-
 from muranoclient.common import exceptions as exc
 from muranoclient.common import utils
 

muranoclient/v1/packages.py

@@ -12,10 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_serialization import jsonutils
 import six
 from six.moves import urllib
-
-from oslo_serialization import jsonutils
 import yaml
 
 from muranoclient.common import base

muranoclient/v1/shell.py

@@ -16,8 +16,6 @@ import functools
 import json
 import os
 import shutil
-import six
-import six.moves
 import sys
 import tempfile
 import uuid
@@ -25,6 +23,8 @@ import zipfile
 
 import jsonpatch
 from oslo_utils import strutils
+import six
+import six.moves
 
 from muranoclient.common import exceptions as common_exceptions
 from muranoclient.common import utils

tools/install_venv.py

@@ -21,8 +21,8 @@
 Installation script for python-muranoclient's development virtualenv
 """
 
-import os
 import ConfigParser
+import os
 import sys
 
 import install_venv_common as install_venv