openstack/deb-murano
Code Issues Proposed changes

Fix import order of modules

Browse Source 
Make corrections in import order for six, yaml, eventlet and
greenlet as per OpenStack import standards [1].

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

Change-Id: I26feb4adb81e8b07a7a36ac7f0a6235536a8c119
This commit is contained in:
Ravi Shekhar Jethani
2016-01-19 23:40:36 -08:00
parent d77aeefd61
commit 7ea4442e9c
23 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/plugins/cloudify_plugin/murano_cloudify_plugin/cloudify_tosca_package.py
View File

@@ -11,9 +11,9 @@
# under the License. # under the License.
import os import os
import yaml
import six import six
import yaml
from murano.packages import exceptions from murano.packages import exceptions
from murano.packages import package_base from murano.packages import package_base

2
murano/api/middleware/fault.py
View File

@@ -14,11 +14,11 @@
Cinder's faultwrapper Cinder's faultwrapper
""" """
import six
import sys import sys
import traceback import traceback
from oslo_config import cfg from oslo_config import cfg
import six
import webob import webob
from murano.common import wsgi from murano.common import wsgi

1
murano/api/v1/cloudfoundry/router.py
View File

@@ -14,7 +14,6 @@
import routes import routes
from murano.api.v1.cloudfoundry import cfapi from murano.api.v1.cloudfoundry import cfapi
from murano.common import wsgi from murano.common import wsgi

3
murano/api/v1/environments.py
View File

@@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_log import log as logging from oslo_log import log as logging
import six
from sqlalchemy import desc from sqlalchemy import desc
from webob import exc from webob import exc

3
murano/api/v1/templates.py
View File

@@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_log import log as logging from oslo_log import log as logging
import six
from webob import exc from webob import exc
from murano.api.v1 import request_statistics from murano.api.v1 import request_statistics

1
murano/cmd/api.py
View File

@@ -19,7 +19,6 @@ import os
import sys import sys
import eventlet import eventlet
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_service import service from oslo_service import service

1
murano/cmd/cfapi.py
View File

@@ -19,7 +19,6 @@ import os
import sys import sys
import eventlet import eventlet
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_service import service from oslo_service import service

1
murano/cmd/engine.py
View File

@@ -18,7 +18,6 @@ import os
import sys import sys
import eventlet import eventlet
from oslo_log import log as logging from oslo_log import log as logging
from oslo_service import service from oslo_service import service

1
murano/common/messaging/subscription.py
View File

@@ -18,6 +18,7 @@ import socket
import time import time
from eventlet import patcher from eventlet import patcher
from murano.common.messaging import message from murano.common.messaging import message
kombu = patcher.import_patched('kombu') kombu = patcher.import_patched('kombu')

2
murano/common/wsgi.py
View File

@@ -18,7 +18,6 @@
import datetime import datetime
import errno import errno
import re import re
import six
import socket import socket
import sys import sys
import time import time
@@ -35,6 +34,7 @@ from oslo_service import service
from oslo_service import sslutils from oslo_service import sslutils
import routes import routes
import routes.middleware import routes.middleware
import six
import webob.dec import webob.dec
import webob.exc import webob.exc

3
murano/context.py
View File

@@ -12,9 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from murano.common import policy
from oslo_context import context from oslo_context import context
from murano.common import policy
class RequestContext(context.RequestContext): class RequestContext(context.RequestContext):
"""Class that stores context info about an API request. """Class that stores context info about an API request.

3
murano/db/migration/helpers.py
View File

@@ -12,9 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from alembic import op from alembic import op
import six
import sqlalchemy as sa import sqlalchemy as sa

2
murano/db/services/environments.py
View File

@@ -12,11 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from keystoneclient import exceptions as ks_exceptions from keystoneclient import exceptions as ks_exceptions
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
import six
import yaml import yaml
from murano.common import auth_utils from murano.common import auth_utils

2
murano/dsl/executor.py
View File

@@ -15,12 +15,12 @@
import collections import collections
import contextlib import contextlib
import itertools import itertools
import six
import weakref import weakref
import eventlet import eventlet
import eventlet.event import eventlet.event
from oslo_log import log as logging from oslo_log import log as logging
import six
from yaql.language import specs from yaql.language import specs
from murano.common.i18n import _LW from murano.common.i18n import _LW

2
murano/dsl/principal_objects/stack_trace.py
View File

@@ -14,8 +14,8 @@
import inspect import inspect
import os.path import os.path
import six
import six
from yaql import specs from yaql import specs
from murano.dsl import constants from murano.dsl import constants

2
murano/dsl/type_scheme.py
View File

@@ -12,10 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
import sys import sys
import uuid import uuid
import six
from yaql.language import specs from yaql.language import specs
from yaql.language import utils from yaql.language import utils
from yaql.language import yaqltypes from yaql.language import yaqltypes

3
murano/dsl/typespec.py
View File

@@ -12,10 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
import sys import sys
import weakref import weakref
import six
from murano.dsl import exceptions from murano.dsl import exceptions
from murano.dsl import type_scheme from murano.dsl import type_scheme

2
murano/dsl/yaql_expression.py
View File

@@ -13,8 +13,8 @@
# under the License. # under the License.
import re import re
import six
import six
from yaql.language import exceptions as yaql_exceptions from yaql.language import exceptions as yaql_exceptions
from yaql.language import expressions from yaql.language import expressions

1
murano/engine/system/agent_listener.py
View File

@@ -15,7 +15,6 @@
import eventlet import eventlet
import greenlet import greenlet
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging

4
murano/engine/system/yaql_functions.py
View File

@@ -17,13 +17,13 @@ import base64
import collections import collections
import random import random
import re import re
import six
from six.moves import range
import string import string
import time import time
import jsonpatch import jsonpatch
import jsonpointer import jsonpointer
import six
from six.moves import range
from yaql.language import specs from yaql.language import specs
from yaql.language import utils from yaql.language import utils
from yaql.language import yaqltypes from yaql.language import yaqltypes

5
murano/policy/modify/actions/action_manager.py
View File

@@ -13,12 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
import yaml
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
import six
from stevedore import extension from stevedore import extension
import yaml
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

1
murano/policy/modify/actions/base.py
View File

@@ -14,6 +14,7 @@
# under the License. # under the License.
import abc import abc
import six import six

2
murano/tests/functional/common/utils.py
View File

@@ -16,6 +16,7 @@ import contextlib
import json import json
import os import os
import random import random
import re
import socket import socket
import telnetlib import telnetlib
import time import time
@@ -27,7 +28,6 @@ import keystoneclient.v3 as keystoneclientv3
from muranoclient import client as mclient from muranoclient import client as mclient
import muranoclient.common.exceptions as exceptions import muranoclient.common.exceptions as exceptions
from oslo_log import log as logging from oslo_log import log as logging
import re
import yaml import yaml
from murano.services import states from murano.services import states