Order imports in alphabetical order (3/9)
This patch is one in a series to re-enable H306 style check rule (imports are in alphabetical order). It touches common and cloudinit files. Implements: blueprint reduce-flake8-ignored-rules (partial) Change-Id: Ie9838dba11323575165fc3bfdfbd0d0b93f653fa
This commit is contained in:
parent
9dd525fc6a
commit
72597753ef
|
@ -12,16 +12,15 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import errno
|
||||
import datetime
|
||||
from distutils.version import LooseVersion
|
||||
import errno
|
||||
import logging
|
||||
import pkg_resources
|
||||
import os
|
||||
import pkg_resources
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from distutils.version import LooseVersion
|
||||
|
||||
|
||||
VAR_PATH = '/var/lib/heat-cfntools'
|
||||
LOG = logging.getLogger('heat-provision')
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from keystoneclient.v2_0 import client as keystone_client
|
||||
from keystoneclient import exceptions as keystone_exceptions
|
||||
from keystoneclient.v2_0 import client as keystone_client
|
||||
from webob.exc import HTTPUnauthorized
|
||||
|
||||
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
import uuid
|
||||
|
||||
from heat.openstack.common import local
|
||||
from heat.common import exception
|
||||
from heat.common import policy
|
||||
from heat.common import wsgi
|
||||
from heat.db import api as db_api
|
||||
from heat.openstack.common import context
|
||||
from heat.openstack.common import importutils
|
||||
from heat.db import api as db_api
|
||||
from heat.openstack.common import local
|
||||
|
||||
|
||||
def generate_request_id():
|
||||
|
|
|
@ -17,16 +17,15 @@ from collections import namedtuple
|
|||
import json
|
||||
import uuid
|
||||
|
||||
from heat.common import context
|
||||
from heat.common import exception
|
||||
|
||||
import keystoneclient.exceptions as kc_exception
|
||||
from keystoneclient.v3 import client as kc_v3
|
||||
from oslo.config import cfg
|
||||
|
||||
from heat.common import context
|
||||
from heat.common import exception
|
||||
from heat.openstack.common.gettextutils import _
|
||||
from heat.openstack.common import importutils
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common.gettextutils import _
|
||||
|
||||
logger = logging.getLogger('heat.common.keystoneclient')
|
||||
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import re
|
||||
import collections
|
||||
import re
|
||||
|
||||
from heat.openstack.common import strutils
|
||||
from heat.openstack.common.py3kcompat import urlutils
|
||||
from heat.openstack.common import strutils
|
||||
|
||||
|
||||
class HeatIdentifier(collections.Mapping):
|
||||
|
|
|
@ -17,8 +17,8 @@ Startup notification using a shell script or systemd NOTIFY_SOCKET
|
|||
style notification
|
||||
"""
|
||||
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common import importutils
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common import processutils
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
|
@ -26,8 +26,8 @@ import pkgutil
|
|||
import sys
|
||||
import types
|
||||
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common.gettextutils import _
|
||||
from heat.openstack.common import log as logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import re
|
||||
import yaml
|
||||
import json
|
||||
import re
|
||||
|
||||
from oslo.config import cfg
|
||||
import yaml
|
||||
|
||||
from heat.common import exception
|
||||
from heat.openstack.common.gettextutils import _
|
||||
|
|
|
@ -17,17 +17,16 @@
|
|||
Utility for fetching a resource (e.g. a template) from a URL.
|
||||
'''
|
||||
|
||||
from oslo.config import cfg
|
||||
import requests
|
||||
from requests import exceptions
|
||||
|
||||
from oslo.config import cfg
|
||||
from heat.openstack.common.gettextutils import _
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common.py3kcompat import urlutils
|
||||
|
||||
cfg.CONF.import_opt('max_template_size', 'heat.common.config')
|
||||
|
||||
from heat.openstack.common import log as logging
|
||||
from heat.openstack.common.gettextutils import _
|
||||
from heat.openstack.common.py3kcompat import urlutils
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@ import sys
|
|||
import time
|
||||
|
||||
import eventlet
|
||||
import eventlet.greenio
|
||||
from eventlet.green import socket
|
||||
from eventlet.green import ssl
|
||||
import eventlet.greenio
|
||||
import eventlet.wsgi
|
||||
from lxml import etree
|
||||
from oslo.config import cfg
|
||||
|
|
Loading…
Reference in New Issue