StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subiquity/controllers/filesystem.py
View File

@ -15,7 +15,13 @@
import logging import logging
import os import os
from subiquitycore.controller import BaseController 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.actions import preserve_action
from subiquity.models import (FilesystemModel, RaidModel) from subiquity.models import (FilesystemModel, RaidModel)
from subiquity.models.filesystem import (_humanize_size) from subiquity.models.filesystem import (_humanize_size)
@ -23,10 +29,6 @@ from subiquity.ui.views import (DiskPartitionView, AddPartitionView,
AddFormatView, FilesystemView, AddFormatView, FilesystemView,
DiskInfoView, RaidView, BcacheView, DiskInfoView, RaidView, BcacheView,
LVMVolumeGroupView) 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") log = logging.getLogger("subiquitycore.controller.filesystem")

5
subiquity/models/filesystem.py
View File

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