block_device: reorder imports

Reorder imports to hacking standard (stdlib, third-party, project) [1]

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

Change-Id: I4aa73321e1e796ef6b8b079e42f90bf5c75388fe
This commit is contained in:
Ian Wienand 2017-05-02 13:43:43 +10:00
parent 0d8c4270c0
commit 2a185ec6b6
7 changed files with 24 additions and 13 deletions

View File

@ -13,9 +13,10 @@
# under the License. # under the License.
import argparse import argparse
import logging
from diskimage_builder.block_device.blockdevice import BlockDevice from diskimage_builder.block_device.blockdevice import BlockDevice
from diskimage_builder import logging_config from diskimage_builder import logging_config
import logging
def val_else_none(s): def val_else_none(s):

View File

@ -13,17 +13,19 @@
# under the License. # under the License.
import codecs import codecs
from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException
from diskimage_builder.graph.digraph import Digraph
import json import json
import logging import logging
import os import os
import shutil import shutil
from stevedore import extension
import sys import sys
import yaml import yaml
from stevedore import extension
from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException
from diskimage_builder.graph.digraph import Digraph
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -12,15 +12,16 @@
# 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 logging
import os
import subprocess
from diskimage_builder.block_device.blockdevicesetupexception \ from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException import BlockDeviceSetupException
from diskimage_builder.block_device.plugin_base import NodePluginBase from diskimage_builder.block_device.plugin_base import NodePluginBase
from diskimage_builder.block_device.tree_config import TreeConfig from diskimage_builder.block_device.tree_config import TreeConfig
from diskimage_builder.block_device.utils import parse_abs_size_spec from diskimage_builder.block_device.utils import parse_abs_size_spec
from diskimage_builder.graph.digraph import Digraph from diskimage_builder.graph.digraph import Digraph
import logging
import os
import subprocess
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -13,6 +13,8 @@
# under the License. # under the License.
import logging import logging
import random import random
from struct import pack from struct import pack

View File

@ -12,6 +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 logging
import os
from subprocess import CalledProcessError
from diskimage_builder.block_device.blockdevicesetupexception \ from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException import BlockDeviceSetupException
from diskimage_builder.block_device.level1.mbr import MBR from diskimage_builder.block_device.level1.mbr import MBR
@ -21,9 +26,7 @@ from diskimage_builder.block_device.utils import exec_sudo
from diskimage_builder.block_device.utils import parse_abs_size_spec from diskimage_builder.block_device.utils import parse_abs_size_spec
from diskimage_builder.block_device.utils import parse_rel_size_spec from diskimage_builder.block_device.utils import parse_rel_size_spec
from diskimage_builder.graph.digraph import Digraph from diskimage_builder.graph.digraph import Digraph
import logging
import os
from subprocess import CalledProcessError
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@ -13,9 +13,10 @@
# under the License. # under the License.
import abc import abc
from diskimage_builder.graph.digraph import Digraph
import six import six
from diskimage_builder.graph.digraph import Digraph
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
class PluginBase(object): class PluginBase(object):

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 diskimage_builder.block_device.utils import parse_abs_size_spec
import testtools import testtools
from diskimage_builder.block_device.utils import parse_abs_size_spec
class TestLoggingConfig(testtools.TestCase): class TestLoggingConfig(testtools.TestCase):