changed most imports to relative

pym/core/backup.py

@@ -21,7 +21,7 @@ import os
 import stat
 import re
 from os import path
-from calculate.core.server.core_interfaces import MethodsInterface
+from .server.core_interfaces import MethodsInterface
 from calculate.lib.utils.files import (makeDirectory, removeDir, tar_directory,
                                        FilePermission, find, listDirectory,
                                        FilesError, process, readFileEx,

pym/core/client/cert_func.py

@@ -25,7 +25,7 @@ from .create_cert import (generateRSAKey, makePKey,
 import hashlib
 from .client_class import HTTPSClientCertTransport
 from .cert_verify import VerifyError
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.utils.files import readFile
 
 VERSION = 0.11

pym/core/client/cert_info.py

@@ -24,8 +24,8 @@ import os
 import sys
 import urllib.request as urllib2
 from urllib.error import URLError
-from calculate.core.datavars import DataVarsCore
-from calculate.core.client.function import clear
+from ..datavars import DataVarsCore
+from .function import clear
 from calculate.consolegui.application.client_class import (
     HTTPSClientCertTransport)
 from calculate.lib.utils.dbus_tools import get_dbus_hostname

pym/core/client/cert_verify.py

@@ -20,7 +20,7 @@ import sys
 import os
 import re
 
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.utils.files import readFile
 
 _ = lambda x: x
@@ -154,8 +154,7 @@ def get_CRL(path_to_cert):
                 CN = subj[1]
 
         if subj and url:
-            from calculate.core.client.client_class import Client_suds
-            from .client_class import HTTPSClientCertTransport
+            from .client_class import Client_suds, HTTPSClientCertTransport
             # connect to ca server (url get from certificates)
             try:
                 client = Client_suds(url, transport=HTTPSClientCertTransport(

pym/core/client/client_class.py

@@ -26,7 +26,7 @@ from httplib.client import HTTPConnection
 import socket
 import ssl
 import hashlib
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.datavars import DataVars
 from calculate.lib.utils.files import readFile
 from suds.client import Client

pym/core/client/create_cert.py

@@ -17,7 +17,7 @@
 import sys
 import socket
 from M2Crypto import RSA, X509, EVP, m2
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 
 _ = lambda x: x
 from calculate.lib.cl_lang import setLocalTranslate

pym/core/client/function.py

@@ -19,7 +19,7 @@ import os
 import sys
 import calculate.contrib
 from suds import MethodNotFound
-from calculate.core.server.cert_cmd import getHwAddr, getIpLocal
+from ..server.cert_cmd import getHwAddr, getIpLocal
 _ = lambda x: x
 from calculate.lib.cl_lang import setLocalTranslate
 

pym/core/server/api_types.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
  
-from calculate.core.server.loaded_methods import LoadedMethods
+from .loaded_methods import LoadedMethods
 
 import calculate.contrib
 from spyne import String, Integer, Boolean
@@ -30,7 +30,7 @@ import sys
 import pickle
 import os
 from calculate.lib.datavars import SourceReadonlyVariable
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from .core_interfaces import CoreServiceInterface
 
 _ = lambda x: x
 from calculate.lib.cl_lang import setLocalTranslate
@@ -597,7 +597,7 @@ class CoreWsdl(CoreServiceInterface):
             if not actionClass:
                 return []
             objs = {}
-            from calculate.core.server.func import CommonLink
+            from .func import CommonLink
 
             if isinstance(logicClass, dict):
                 for k, v in logicClass.items():

pym/core/server/baseClass.py

@@ -24,7 +24,7 @@ from spyne import rpc
 from spyne import Service
 from spyne import String, Integer, Array
 
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from .core_interfaces import CoreServiceInterface
 from calculate.lib.utils.files import readFile
 
 _ = lambda x: x

pym/core/server/bootstrap.py

@@ -22,13 +22,13 @@ import datetime
 import subprocess
 import shutil
 
-from calculate.core.client.cert_func import new_key_req
-from calculate.core.client.function import get_ip_mac_type
-from calculate.core.datavars import DataVarsCore
+from ..client.cert_func import new_key_req
+from ..client.function import get_ip_mac_type
+from ..datavars import DataVarsCore
 from calculate.lib.utils.files import (makeDirectory, pathJoin, readFile,
                                        writeFile, readFileEx)
 from calculate.lib.utils.mount import isMount
-from calculate.core.server.admin import Admins
+from .admin import Admins
 import os
 import hashlib
 import pwd

pym/core/server/cert_cmd.py

@@ -26,7 +26,7 @@ import hashlib
 import sys
 from .func import new_key_req, uniq
 from calculate.lib.utils import ip as ip
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.utils.files import readFile
 from calculate.lib.utils.text import _u8
 import urllib.request as u2

pym/core/server/certificate.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import MethodsInterface
+from .func import MethodsInterface
 
 from calculate.lib.cl_lang import getLazyLocalTranslate, setLocalTranslate
 from calculate.lib.utils.common import getPagesInterval

pym/core/server/cl_server.py

@@ -65,7 +65,7 @@ def main(*args, **keywords):
         parser.print_help()
         return 0
 
-    from calculate.core.datavars import DataVarsCore
+    from ..datavars import DataVarsCore
 
     ob = DataVarsCore()
     ob.importCore()
@@ -240,7 +240,7 @@ def main(*args, **keywords):
     core_wsdl_classes = []
     core_wsdl_classes.append(func_metaclass.Func_MetaClass)
 
-    from calculate.core.server.baseClass import Basic
+    from .baseClass import Basic
     # make server metaclass
     if args.method or args.list_methods:
         from .local_call import local_method, LocalCall

pym/core/server/clean.py

@@ -21,8 +21,8 @@ import sys
 import time
 import datetime
 import pickle
-from calculate.core.datavars import DataVarsCore
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from ..datavars import DataVarsCore
+from .core_interfaces import CoreServiceInterface
 from calculate.lib.cl_lang import setLocalTranslate
 
 _ = lambda x: x

pym/core/server/client_class.py

@@ -22,7 +22,7 @@ import calculate.contrib
 from suds.transport.http import HttpTransport
 from httplib import HTTPConnection, HTTPSConnection
 import socket
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.cl_lang import setLocalTranslate
 
 _ = lambda x: x

pym/core/server/func.py

@@ -26,7 +26,7 @@ from os import path
 import glob
 import traceback
 from traceback import print_exc
-from calculate.core.server.core_interfaces import (CoreServiceInterface,
+from .core_interfaces import (CoreServiceInterface,
                                                    MethodsInterface)
 from calculate.install.distr import Distributive
 from calculate.lib.cl_log import log
@@ -48,9 +48,8 @@ from itertools import *
 import calculate.contrib
 from spyne import String, Integer, Boolean, Array
 
-from calculate.core.server.api_types import ReturnedMessage, CommonInfo
-from calculate.core.server.api_types import (Field,
-                                             GroupField, ViewInfo, ViewParams)
+from .api_types import ReturnedMessage, CommonInfo
+from .api_types import (Field, GroupField, ViewInfo, ViewParams)
 from calculate.lib.cl_template import Template
 from calculate.lib.datavars import DataVars
 from .loaded_methods import LoadedMethods
@@ -836,7 +835,7 @@ def catchExcept(*skipException):
             try:
                 return self.f(*args, **kwargs)
             except BaseException as e:
-                from calculate.core.server.api_types import ViewInfo, \
+                from .api_types import ViewInfo, \
                     GroupField, Field
 
                 if isinstance(e, KeyboardInterrupt):
@@ -1049,13 +1048,13 @@ class CoreWsdl(CoreServiceInterface):
             self.Num = 100000
 
         def pauseProcess(self):
-            from calculate.core.server.gen_pid import ProcessStatus
+            from .gen_pid import ProcessStatus
 
             self.method_status = ProcessStatus.Paused
             self.writeFile()
 
         def resumeProcess(self):
-            from calculate.core.server.gen_pid import ProcessStatus
+            from .gen_pid import ProcessStatus
 
             self.method_status = ProcessStatus.Worked
             self.writeFile()
@@ -1063,7 +1062,7 @@ class CoreWsdl(CoreServiceInterface):
         def writeFile(self):
             """ write data in file """
             from .baseClass import Basic
-            from calculate.core.server.gen_pid import ProcessMode
+            from .gen_pid import ProcessMode
 
             if not os.path.exists(Basic.pids):
                 makeDirectory(Basic.pids)

pym/core/server/gen_pid.py

@@ -21,7 +21,7 @@ import pickle
 import threading
 from os import path
 import random
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from .core_interfaces import CoreServiceInterface
 from calculate.lib.utils.files import listDirectory, readFile, readLinesFile
 from calculate.lib.utils.tools import ignore
 import socket

pym/core/server/gen_sid.py

@@ -22,7 +22,7 @@ import datetime
 import threading
 import random
 import pickle
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from .core_interfaces import CoreServiceInterface
 from .cert_cmd import find_cert_id
 
 

pym/core/server/groups.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.core_interfaces import MethodsInterface
+from .core_interfaces import MethodsInterface
 
 from calculate.lib.utils.files import readLinesFile
 from calculate.lib.utils.common import getPagesInterval

pym/core/server/local_call.py

@@ -33,12 +33,12 @@ from calculate.lib.utils.text import tableReport
 from calculate.lib.cl_print import color_print
 from calculate.lib.datavars import VariableError, CriticalError
 from calculate.lib.cl_lang import setLocalTranslate
-from calculate.core.server.api_types import FieldAdapter
+from .api_types import FieldAdapter
 from calculate.lib.utils.tools import ignore
 from calculate.lib.utils.files import makeDirectory
-from calculate.core.result_viewer import ResultViewer
-from calculate.core.server.loaded_methods import LoadedMethods
-from calculate.core.result_viewer_gui import ProgressGui, ErrorGui, WarningGui
+from .result_viewer import ResultViewer
+from .loaded_methods import LoadedMethods
+from .result_viewer_gui import ProgressGui, ErrorGui, WarningGui
 from .gen_pid import ProcessStatus
 
 from .methods_func import (get_method_argparser, collect_object,
@@ -123,7 +123,7 @@ class LocalCall():
 
         def writeFile(self):
             """ write data in file """
-            from calculate.core.server.gen_pid import ProcessMode
+            from .gen_pid import ProcessMode
 
             if os.getuid():
                 return

pym/core/server/methods_func.py

@@ -23,7 +23,7 @@ import re
 from calculate.lib.utils.common import getpass
 from calculate.lib.cl_print import color_print
 from calculate.lib.cl_lang import setLocalTranslate
-from calculate.core.server.api_types import TableAdapter
+from .api_types import TableAdapter
 from functools import reduce
 
 _ = lambda x: x

pym/core/server/request.py

@@ -17,7 +17,7 @@
 import sys
 import os
 import subprocess
-from calculate.core.server.core_interfaces import MethodsInterface
+from .core_interfaces import MethodsInterface
 
 from calculate.lib.utils.files import pathJoin, readFile
 from calculate.lib.utils.common import getPagesInterval

pym/core/server/sid_pid_file.py

@@ -19,7 +19,7 @@ import time
 from os import path
 import pickle
 from threading import Lock
-from calculate.core.server.core_interfaces import CoreServiceInterface
+from .core_interfaces import CoreServiceInterface
 from calculate.lib.utils.tools import ignore
 
 

pym/core/server/spyne_adapter.py

@@ -21,8 +21,7 @@ from spyne import String, Integer, Array, rpc
 from .func import WsdlMeta
 from .api_types import ReturnedMessage, ViewInfo, ViewParams
 from spyne.protocol._outbase import OutProtocolBase
-# from .api_types import LazyString
-import calculate.core.server.api_types as api_types
+from .api_types import LazyString
  
 #monkey patch:
 def to_unicode(self, cls, value, *args, **kwargs):
@@ -30,7 +29,7 @@ def to_unicode(self, cls, value, *args, **kwargs):
         return None
 
     #### PATCH ####################
-    if isinstance(value, api_types.LazyString):
+    if isinstance(value, LazyString):
         value = str(value)
     ###############################
 

pym/core/server/tasks.py

@@ -20,7 +20,7 @@ from os import path
 import time
 import glob
 import pickle
-from calculate.core.datavars import DataVarsCore
+from ..datavars import DataVarsCore
 from calculate.lib.cl_lang import setLocalTranslate
 
 _ = lambda x: x

pym/core/set_vars.py

@@ -17,7 +17,7 @@
 
 import sys
 import re
-from calculate.core.server.core_interfaces import MethodsInterface
+from .server.core_interfaces import MethodsInterface
 
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 

pym/core/setup_package.py

@@ -19,9 +19,9 @@ import sys
 import os
 from os import path
 
-from calculate.core.datavars import DataVars
-from calculate.core.server.core_interfaces import MethodsInterface
-from calculate.core.server.gen_pid import get_pid_info, ProcessMode
+from .datavars import DataVars
+from .server.core_interfaces import MethodsInterface
+from .server.gen_pid import get_pid_info, ProcessMode
 from calculate.lib.datavars import Variable
 from calculate.lib.cl_log import log
 from calculate.lib.utils.common import getPasswdUsers
@@ -315,7 +315,7 @@ class UpdateConfigs(UpdateLogger):
         """
         Проверить наличие запущенных процессов в cl-core
         """
-        from calculate.core.server.loaded_methods import LoadedMethods
+        from .server.loaded_methods import LoadedMethods
 
         cur_pid = os.getpid()
         pid_list = [pid for pid in get_pid_info(self.clVars)

pym/core/utils/cl_backup.py

@@ -15,11 +15,11 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action, Tasks
+from ..server.func import Action, Tasks
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError
-from calculate.core.backup import BackupError
+from ..backup import BackupError
 from calculate.lib.cl_template import TemplatesError
 
 _ = lambda x: x

pym/core/utils/cl_backup_restore.py

@@ -15,11 +15,11 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action, Tasks
+from ..server.func import Action, Tasks
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError
-from calculate.core.backup import BackupError
+from ..backup import BackupError
 from calculate.lib.cl_template import TemplatesError
 from tarfile import ReadError
 

pym/core/utils/cl_config.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError

pym/core/utils/cl_core_custom.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.datavars import VariableError
 from calculate.lib.cl_template import TemplatesError

pym/core/utils/cl_core_dispatch.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 

pym/core/utils/cl_core_group.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 

pym/core/utils/cl_core_patch.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError

pym/core/utils/cl_core_request.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 

pym/core/utils/cl_core_restart.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.datavars import VariableError
 from calculate.lib.cl_template import TemplatesError

pym/core/utils/cl_core_setup.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError

pym/core/utils/cl_core_variables.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.lib.datavars import VariableError, DataVarsError

pym/core/utils/cl_core_view_cert.py

@@ -15,7 +15,7 @@
 #  limitations under the License.
 
 import sys
-from calculate.core.server.func import Action
+from ..server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 

pym/core/variables/certificate.py

@@ -19,8 +19,8 @@ import sys
 
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.lib.utils.files import pathJoin, listDirectory, readFile
-from calculate.core.server.loaded_methods import LoadedMethods
-from calculate.core.server.func import uniq
+from ..server.loaded_methods import LoadedMethods
+from ..server.func import uniq
 
 _ = lambda x: x
 setLocalTranslate('cl_core3', sys.modules[__name__])

pym/core/variables/groups.py

@@ -18,8 +18,8 @@ import sys
 import re
 
 from calculate.lib.cl_lang import setLocalTranslate
-from calculate.core.server.loaded_methods import LoadedMethods
-from calculate.core.server.func import uniq
+from ..server.loaded_methods import LoadedMethods
+from ..server.func import uniq
 from calculate.lib.utils.files import readFile
 
 _ = lambda x: x

pym/core/variables/variable.py

@@ -18,8 +18,7 @@ import re
 from os import path
 from calculate.lib.datavars import (Variable, ReadonlyVariable, VariableError,
                                     TableVariable)
-# from calculate.core.server.api_types import LazyString
-import calculate.core.server.api_types as api_types
+from ..server.api_types import LazyString
 
 from calculate.lib.cl_lang import setLocalTranslate
 
@@ -170,7 +169,7 @@ class VariableClVariableValue(VarHelper, Variable):
     """
     type = "list"
 
-    class LazyVal(api_types.LazyString):
+    class LazyVal(LazyString):
         """
         Lazy value return string value only before using
         """

pym/core/wsdl_core.py

@@ -31,23 +31,23 @@ from .server import groups as groups
 from .server import request as request
 from . import set_vars
 from .backup import Backup, BackupError
-from calculate.core.utils.cl_backup import ClBackupAction
-from calculate.core.utils.cl_backup_restore import ClBackupRestoreAction
-from calculate.core.server.func import WsdlBase
-from calculate.core.utils.cl_core_setup import ClCoreSetupAction
-from calculate.core.utils.cl_core_patch import ClCorePatchAction
-from calculate.core.utils.cl_config import ClConfigAction
-from calculate.core.utils.cl_core_dispatch import ClCoreDispatchAction
-from calculate.core.utils.cl_core_view_cert import ClCoreViewCert
-from calculate.core.utils.cl_core_group import (
+from .utils.cl_backup import ClBackupAction
+from .utils.cl_backup_restore import ClBackupRestoreAction
+from .server.func import WsdlBase
+from .utils.cl_core_setup import ClCoreSetupAction
+from .utils.cl_core_patch import ClCorePatchAction
+from .utils.cl_config import ClConfigAction
+from .utils.cl_core_dispatch import ClCoreDispatchAction
+from .utils.cl_core_view_cert import ClCoreViewCert
+from .utils.cl_core_group import (
     ClCoreGroupShow, ClCoreGroupMod, ClCoreGroupAdd, ClCoreGroupDel)
-from calculate.core.utils.cl_core_request import (
+from .utils.cl_core_request import (
     ClCoreRequestShow, ClCoreRequestConfirm, ClCoreRequestDel)
-from calculate.core.utils.cl_core_variables import (ClCoreVariables,
+from .utils.cl_core_variables import (ClCoreVariables,
                                                     ClCoreVariablesShow)
-from calculate.core.utils.cl_core_custom import ClCoreCustomAction
-from calculate.core.utils.cl_core_restart import ClCoreRestartAction
-from calculate.core.variables.action import Actions
+from .utils.cl_core_custom import ClCoreCustomAction
+from .utils.cl_core_restart import ClCoreRestartAction
+from .variables.action import Actions
 
 
 class Wsdl(WsdlBase):