From: Zhongyue Luo Date: Tue, 27 Aug 2013 02:04:47 +0000 (+0800) Subject: Import order cleanup X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ef50bb47e21b1b70928f79cc7e160d8c78a83071;p=openstack-build%2Fcinder-build.git Import order cleanup According to https://github.com/openstack-dev/hacking/blob/master/HACKING.rst#imports imports must be ordered by the full module path by the below template {{stdlib imports in human alphabetical order}} \n {{third-party lib imports in human alphabetical order}} \n {{project imports in human alphabetical order}} \n \n {{begin your code}} Change-Id: Ia517e629d557133fca1a4927020a93e9e2abf3f9 --- diff --git a/cinder/backup/drivers/ceph.py b/cinder/backup/drivers/ceph.py index 01a5ec21f..a442835fc 100644 --- a/cinder/backup/drivers/ceph.py +++ b/cinder/backup/drivers/ceph.py @@ -41,11 +41,13 @@ was deemed the safest action to take. It is therefore recommended to always restore to a new volume (default). """ -import eventlet import os import re import time +import eventlet +from oslo.config import cfg + from cinder.backup.driver import BackupDriver from cinder import exception from cinder.openstack.common import log as logging @@ -53,7 +55,6 @@ from cinder.openstack.common import processutils from cinder import units from cinder import utils import cinder.volume.drivers as drivers -from oslo.config import cfg try: import rados diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py index 51de25158..0e92d4125 100644 --- a/cinder/tests/test_backup_ceph.py +++ b/cinder/tests/test_backup_ceph.py @@ -14,13 +14,14 @@ # under the License. """ Tests for Ceph backup service """ -import eventlet import hashlib import os import tempfile import time import uuid +import eventlet + from cinder.backup.drivers import ceph from cinder import context from cinder import db diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py index 39c9da5af..be1696468 100644 --- a/cinder/tests/test_glusterfs.py +++ b/cinder/tests/test_glusterfs.py @@ -17,6 +17,7 @@ """Unit tests for the GlusterFS driver module.""" import errno +import json import os import mox as mox_lib @@ -24,8 +25,6 @@ from mox import IgnoreArg from mox import IsA from mox import stubout -import json - from cinder import context from cinder import exception from cinder.openstack.common import processutils as putils diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py index f971749d6..332a13a49 100644 --- a/cinder/tests/test_nfs.py +++ b/cinder/tests/test_nfs.py @@ -20,21 +20,18 @@ import __builtin__ import errno import os -from oslo.config import cfg - import mox as mox_lib from mox import IgnoreArg from mox import IsA from mox import stubout +from oslo.config import cfg from cinder import context from cinder import exception +from cinder.image import image_utils from cinder.openstack.common import processutils as putils from cinder import test from cinder import units - -from cinder.image import image_utils - from cinder.volume import configuration as conf from cinder.volume.drivers import nfs diff --git a/cinder/tests/test_utils.py b/cinder/tests/test_utils.py index db97ec3b8..2e7ed8dbe 100644 --- a/cinder/tests/test_utils.py +++ b/cinder/tests/test_utils.py @@ -19,7 +19,6 @@ import __builtin__ import datetime import hashlib import os -import paramiko import socket import StringIO import tempfile @@ -27,6 +26,7 @@ import uuid import mox from oslo.config import cfg +import paramiko import cinder from cinder.brick.initiator import connector diff --git a/cinder/utils.py b/cinder/utils.py index 3a3ba2fe0..e48d9ee54 100644 --- a/cinder/utils.py +++ b/cinder/utils.py @@ -26,7 +26,6 @@ import functools import hashlib import inspect import os -import paramiko import pyclbr import random import re @@ -43,8 +42,8 @@ from xml.sax import saxutils from eventlet import event from eventlet import greenthread from eventlet import pools - from oslo.config import cfg +import paramiko from cinder.brick.initiator import connector from cinder import exception diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py index 35c64f235..c6fc55749 100644 --- a/cinder/volume/drivers/netapp/nfs.py +++ b/cinder/volume/drivers/netapp/nfs.py @@ -22,6 +22,8 @@ import copy import os import time +from oslo.config import cfg + from cinder import exception from cinder.openstack.common import log as logging from cinder.openstack.common import processutils @@ -34,7 +36,6 @@ from cinder.volume.drivers.netapp.options import netapp_transport_opts from cinder.volume.drivers.netapp.utils import provide_ems from cinder.volume.drivers.netapp.utils import validate_instantiation from cinder.volume.drivers import nfs -from oslo.config import cfg LOG = logging.getLogger(__name__) diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py index 3b944fb90..2b4ba2418 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_common.py +++ b/cinder/volume/drivers/san/hp/hp_3par_common.py @@ -41,7 +41,6 @@ array. import ast import base64 import json -import paramiko import pprint from random import randint import re @@ -52,6 +51,7 @@ from eventlet import greenthread from hp3parclient import client from hp3parclient import exceptions as hpexceptions from oslo.config import cfg +import paramiko from cinder import context from cinder import exception diff --git a/cinder/volume/flows/create_volume.py b/cinder/volume/flows/create_volume.py index 7bafa569b..b91ba58e4 100644 --- a/cinder/volume/flows/create_volume.py +++ b/cinder/volume/flows/create_volume.py @@ -26,23 +26,21 @@ from oslo.config import cfg from cinder import exception from cinder.image import glance -from cinder import policy -from cinder import quota -from cinder import units -from cinder import utils - from cinder.openstack.common import excutils from cinder.openstack.common import log as logging from cinder.openstack.common.notifier import api as notifier from cinder.openstack.common import processutils from cinder.openstack.common import timeutils -from cinder.volume.flows import base -from cinder.volume import utils as volume_utils -from cinder.volume import volume_types - +from cinder import policy +from cinder import quota from cinder.taskflow import decorators from cinder.taskflow.patterns import linear_flow from cinder.taskflow import task +from cinder import units +from cinder import utils +from cinder.volume.flows import base +from cinder.volume import utils as volume_utils +from cinder.volume import volume_types LOG = logging.getLogger(__name__)