From fc783d6c22dd879a0d0a68e877a47504ad8a2f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 11 Sep 2017 17:02:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * вынос mount функций из utils/files в utils/mount --- pym/desktop/desktop.py | 5 +++-- pym/desktop/utils/cl_desktop.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pym/desktop/desktop.py b/pym/desktop/desktop.py index 2d2224e..3d4de8d 100644 --- a/pym/desktop/desktop.py +++ b/pym/desktop/desktop.py @@ -22,8 +22,9 @@ from calculate.core.server.core_interfaces import MethodsInterface from calculate.desktop._cl_keys import getKey -from calculate.lib.utils.files import (isMount, process, - getRunCommands, STDOUT, childMounts, +from calculate.lib.utils.mount import isMount, childMounts +from calculate.lib.utils.files import (process, + getRunCommands, STDOUT, getLoopFromPath, getMdRaidDevices, listDirectory, removeDir, rsync_files, RsyncOptions, diff --git a/pym/desktop/utils/cl_desktop.py b/pym/desktop/utils/cl_desktop.py index d5048c9..39b589d 100644 --- a/pym/desktop/utils/cl_desktop.py +++ b/pym/desktop/utils/cl_desktop.py @@ -18,7 +18,8 @@ import sys from os import path from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate -from calculate.lib.utils.files import FilesError, isMount, listDirectory +from calculate.lib.utils.files import FilesError, listDirectory +from calculate.lib.utils.mount import isMount from calculate.desktop.desktop import DesktopError from calculate.lib.cl_template import TemplatesError