tweak formatting of import blocks

This commit is contained in:
Michael Hudson-Doyle 2016-07-26 16:03:03 +12:00
parent d9f596c994
commit f639aaff0c
2 changed files with 9 additions and 6 deletions

View File

@ -15,7 +15,13 @@
import logging
import os
from subiquitycore.controller import BaseController
from subiquitycore.ui.dummy import DummyView
from subiquitycore.ui.error import ErrorView
from subiquitycore.curtin import (curtin_write_storage_actions,
curtin_write_preserved_actions)
from subiquity.models.actions import preserve_action
from subiquity.models import (FilesystemModel, RaidModel)
from subiquity.models.filesystem import (_humanize_size)
@ -23,10 +29,6 @@ from subiquity.ui.views import (DiskPartitionView, AddPartitionView,
AddFormatView, FilesystemView,
DiskInfoView, RaidView, BcacheView,
LVMVolumeGroupView)
from subiquitycore.ui.dummy import DummyView
from subiquitycore.ui.error import ErrorView
from subiquitycore.curtin import (curtin_write_storage_actions,
curtin_write_preserved_actions)
log = logging.getLogger("subiquitycore.controller.filesystem")

View File

@ -15,16 +15,17 @@
import json
import logging
import math
import os
import re
from subiquitycore.model import BaseModel
from .blockdev import (Bcachedev,
Blockdev,
LVMDev,
Raiddev,
sort_actions)
import math
from subiquitycore.model import BaseModel
HUMAN_UNITS = ['B', 'K', 'M', 'G', 'T', 'P']