Рефакторинг

* вынос mount функций из utils/files в utils/mount
master-3.5
parent a6304942fc
commit 6067a03d77

@ -30,9 +30,10 @@ from calculate.lib.cl_ini_parser import iniParser
from calculate.lib.cl_print import color_print
from calculate.lib.utils.ip import Pinger, IPError
from calculate.lib.utils.files import (getModeFile, removeDir,
isMount, pathJoin, tarLinks,
pathJoin, tarLinks,
listDirectory, process, find, STDOUT,
sambaPasswordCheck, checkUtils)
from calculate.lib.utils.mount import isMount
from calculate.lib.utils.common import cmpVersion
from calculate.desktop._cl_keys import getKey, clearKey
from calculate.lib.convertenv import convertEnv

@ -22,7 +22,7 @@ from calculate.lib.utils.files import FilesError
from calculate.desktop.desktop import DesktopError
from calculate.client.client import ClientError
from calculate.lib.cl_template import TemplatesError
from calculate.lib.utils.files import isMount
from calculate.lib.utils.mount import isMount
_ = lambda x: x
setLocalTranslate('cl_client3', sys.modules[__name__])

@ -23,8 +23,9 @@ from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable,
HumanReadable)
from calculate.lib.cl_ini_parser import iniParser
from calculate.lib.utils.device import sysfs
from calculate.lib.utils.files import (isMount, readFile, find,
from calculate.lib.utils.files import (readFile, find,
FindFileType)
from calculate.lib.utils.mount import isMount
from calculate.lib.utils.common import getValueFromCmdLine, CmdlineParams
from calculate.lib.utils.portage import isPkgInstalled
from calculate.lib.variables import user

Loading…
Cancel
Save