imports to relative

pym/install/utils/cl_install.py

@@ -16,14 +16,14 @@
 
 import sys
 from calculate.core.server.func import Action, Tasks
-from calculate.install.distr import DistributiveError
-from calculate.install.migrate_users import MigrationError
-from calculate.install.variables.autopartition import AutopartitionError
+from ..distr import DistributiveError
+from ..migrate_users import MigrationError
+from ..variables.autopartition import AutopartitionError
 from calculate.lib.utils.partition import VolumesError
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate, _
 from calculate.lib.cl_template import TemplatesError
 from calculate.lib.utils.files import FilesError
-from calculate.install.install import InstallError
+from ..install import InstallError
 
 setLocalTranslate('cl_install3', sys.modules[__name__])
 __ = getLazyLocalTranslate(_)

pym/install/utils/cl_setup.py

@@ -16,14 +16,14 @@
 
 import sys
 from calculate.core.server.func import Action
-from calculate.install.distr import DistributiveError
-from calculate.install.migrate_users import MigrationError
+from ..distr import DistributiveError
+from ..migrate_users import MigrationError
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate, _
 from calculate.lib.cl_template import TemplatesError
 from calculate.lib.utils.files import FilesError
 from calculate.lib.utils.portage import isPkgInstalled
-from calculate.install.install import InstallError
-from calculate.install.variables.autopartition import AutopartitionError
+from ..install import InstallError
+from ..variables.autopartition import AutopartitionError
 
 setLocalTranslate('cl_install3', sys.modules[__name__])
 __ = getLazyLocalTranslate(_)

pym/install/variables/X11.py

@@ -34,7 +34,7 @@ from calculate.lib.utils.common import (getVideoFromXorgLog,
                                         getVideoFromVendor, getInstalledVideo,
                                         CmdlineParams)
 from calculate.lib.utils.video import get_edid_data, EdidInfoError, EdidInfo
-from calculate.install.distr import DistributiveError
+from ..distr import DistributiveError
 import fcntl
 import struct
 from collections import OrderedDict

pym/install/variables/audio.py

@@ -22,7 +22,7 @@ from calculate.lib.datavars import (Variable, ReadonlyVariable,
 from calculate.lib.utils.common import getValueFromCmdLine, CmdlineParams
 from calculate.lib.utils.portage import isPkgInstalled
 from calculate.lib.utils.files import readFile, readLinesFile
-from calculate.install.distr import DistributiveError
+from ..distr import DistributiveError
 import glob
 
 from calculate.lib.cl_lang import setLocalTranslate, _

pym/install/variables/autopartition.py

@@ -24,7 +24,7 @@ from calculate.lib.utils.device import humanreadableSize
 from calculate.lib.utils import partition
 from calculate.lib.utils.files import (readLinesFile)
 from calculate.lib.utils.mount import isMount, try_umount
-from calculate.install.fs_manager import FileSystemManager
+from ..fs_manager import FileSystemManager
 from calculate.lib.utils.tools import Sizes, traverse
 from itertools import *
 

pym/install/variables/disk.py

@@ -22,7 +22,7 @@ import fcntl
 from subprocess import Popen
 from os import path
 from itertools import *
-from calculate.install.distr import (FlashDistributive, DistributiveError,
+from ..distr import (FlashDistributive, DistributiveError,
                                      IsoDistributive)
 from calculate.lib.datavars import (TableVariable, Variable, VariableError,
                                     ReadonlyVariable, ReadonlyTableVariable,
@@ -32,11 +32,11 @@ import calculate.lib.utils.device as device
 from calculate.lib.utils.device import (getPartitionSize,
                                         humanreadableSize,
                                         getUUIDDict)
-from calculate.install.variables.autopartition import Sizes
+from ..variables.autopartition import Sizes
 from calculate.lib.utils.files import getProgPath
 from calculate.lib.utils.mount import isMount, FStab, DiskSpace, Btrfs, \
     BtrfsError, try_umount
-from calculate.install.fs_manager import FileSystemManager
+from ..fs_manager import FileSystemManager
 
 from calculate.lib.cl_lang import setLocalTranslate, _
 from calculate.lib.variables.system import RootType

pym/install/variables/distr.py

@@ -26,14 +26,14 @@ from calculate.lib.utils.common import (getSupportArch, getTupleVersion,
                                         cmpVersion)
 from calculate.lib.utils.files import listDirectory, pathJoin
 from calculate.lib.variables.linux import Linux
-from calculate.install.distr import (Distributive, PartitionDistributive,
+from ..distr import (Distributive, PartitionDistributive,
                                      DirectoryDistributive, DefaultMountPath,
                                      DistributiveError, FlashDistributive,
                                      ArchiveDistributive,
                                      MultiPartitions, PxeDistributive)
 
 from calculate.lib.cl_lang import setLocalTranslate, _
-from calculate.install.fs_manager import FileSystemManager
+from ..fs_manager import FileSystemManager
 from functools import reduce, cmp_to_key
 
 setLocalTranslate('cl_install3', sys.modules[__name__])

pym/install/variables/kernel.py

@@ -36,7 +36,7 @@ from calculate.lib.utils.files import readLinesFile
 from calculate.lib.utils.common import (getKernelUid, getTupleVersion,
                                         getValueFromCmdLine, CmdlineParams)
 from itertools import *
-from calculate.install.distr import DistributiveError
+from ..distr import DistributiveError
 
 
 class VariableOsInstallKernelScheduler(Variable):

pym/install/variables/net.py

@@ -37,7 +37,7 @@ from calculate.lib.utils import ip
 from calculate.lib.utils.portage import isPkgInstalled
 from operator import itemgetter
 from itertools import *
-from calculate.install.distr import DistributiveError
+from ..distr import DistributiveError
 
 
 class NetHelper(VariableInterface):

pym/install/variables/system.py

@@ -21,7 +21,7 @@ from os import path
 from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable,
                                     TableVariable, PasswordError,
                                     DataVarsError, VariableInterface)
-from calculate.install.fs_manager import FileSystemManager
+from ..fs_manager import FileSystemManager
 from calculate.lib.utils.files import (readFile, getProgPath, process,
                                        readLinesFile, readFileEx)
 from calculate.lib.utils.common import (getPasswdUsers, getUserGroups,

pym/install/wsdl_install.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 import sys
 
 from calculate.lib.datavars import VariableError, DataVarsError
-from calculate.install.distr import DistributiveError
+from .distr import DistributiveError
 
 from . import install
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate, _
@@ -28,8 +28,8 @@ __ = getLazyLocalTranslate(_)
 
 from calculate.core.server.func import WsdlBase
 from calculate.lib.utils.partition import VolumesError
-from calculate.install.utils.cl_install import ClInstallAction
-from calculate.install.utils.cl_setup import (
+from .utils.cl_install import ClInstallAction
+from .utils.cl_setup import (
     ClSetupLocaleAction, ClSetupVideoAction, ClSetupSystemAction,
     ClSetupBootAction, ClSetupNetworkAction, ClSetupAudioAction,
     ClSetupSessionAction, ClSetupThemesAction)