Refactoring

pym/update/emerge_parser.py

@@ -23,9 +23,10 @@ import re
 import sys
 from calculate.lib.utils.colortext.palette import TextState
 from calculate.lib.utils.tools import ignore
+from calculate.lib.utils.git import Git, GitError
 from calculate.lib.utils.portage import (EmergePackage, PackageList,
                                          EmergeUpdateInfo,
-                                         EmergeRemoveInfo, Git, GitError)
+                                         EmergeRemoveInfo)
 
 Colors = TextState.Colors
 import pexpect

pym/update/update.py

@@ -38,7 +38,8 @@ import shutil
 from collections import MutableSet
 from update_tasks import EmergeMark
 
-from calculate.lib.utils.portage import (Git, Layman, EmergeLog, GitError,
+from calculate.lib.utils.git import Git, GitError
+from calculate.lib.utils.portage import (Layman, EmergeLog,
                                          EmergeLogNamedTask, PackageList,
                                          PackageInformation,
                                          get_packages_files_directory,

pym/update/utils/cl_setup_update.py

@@ -19,7 +19,7 @@ from calculate.core.server.func import Action
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.utils.files import FilesError
 from calculate.update.update import UpdateError
-from calculate.lib.utils.portage import GitError
+from calculate.lib.utils.git import GitError
 
 _ = lambda x: x
 setLocalTranslate('cl_update3', sys.modules[__name__])

pym/update/utils/cl_update.py

@@ -21,7 +21,8 @@ from calculate.lib.cl_template import TemplatesError
 from calculate.lib.utils.files import FilesError
 from calculate.update.update import UpdateError
 from calculate.update.emerge_parser import EmergeError
-from calculate.lib.utils.portage import (GitError, EmergeLog,
+from calculate.lib.utils.git import GitError
+from calculate.lib.utils.portage import (EmergeLog,
                                          EmergeLogNamedTask, PackageList)
 from calculate.update.update_tasks import EmergeMark
 

pym/update/utils/cl_update_profile.py

@@ -20,7 +20,7 @@ from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.cl_template import TemplatesError
 from calculate.lib.utils.files import FilesError
 from calculate.update.update import UpdateError
-from calculate.lib.utils.portage import GitError
+from calculate.lib.utils.git import GitError
 
 _ = lambda x: x
 setLocalTranslate('cl_update3', sys.modules[__name__])

pym/update/variables/update.py

@@ -21,13 +21,15 @@ from os import path
 from calculate.lib.datavars import (Variable, VariableError,
                                     ReadonlyVariable, ReadonlyTableVariable,
                                     TableVariable, FieldValue,
+                                    HumanReadable,
                                     SimpleDataVars, DataVarsError)
 from calculate.lib.utils.files import readFile, listDirectory, process, pathJoin
 
 from calculate.lib.configparser import ConfigParser
 from calculate.lib.cl_lang import setLocalTranslate
 from calculate.lib.utils.text import simplify_profiles
-from calculate.lib.utils.portage import Git, GitError, Layman
+from calculate.lib.utils.git import Git, GitError
+from calculate.lib.utils.portage import Layman
 from ..profile import (RepositoryStorageSet, DEFAULT_BRANCH,
                        LocalStorage, ProfileRepository, CacheStorage)
 
@@ -306,7 +308,7 @@ class VariableClUpdateBinhostData(ReadonlyTableVariable):
             pass
         return "", -1
 
-    def get(self, hr=False):
+    def get(self, hr=HumanReadable.No):
         binhost = self.Get('cl_update_binhost')
         recheck = self.GetBool('cl_update_binhost_recheck_set')
 
@@ -551,7 +553,7 @@ class VariableClUpdateOtherRepData(ReadonlyTableVariable):
             if rname in layman_overlays and rname not in repNames:
                 yield (rname, rpath)
 
-    def get(self, hr=False):
+    def get(self, hr=HumanReadable.No):
         return list(self.generator())
 
 class VariableClUpdateOtherRepName(FieldValue,ReadonlyVariable):
@@ -714,7 +716,7 @@ class VariableClUpdateProfileDependData(ReadonlyTableVariable):
         return False
 
 
-    def get(self, hr=False):
+    def get(self, hr=HumanReadable.No):
         dv = self.Get(self.datavars)
         # TODO:  неиспользуемая переменная возможно
         # испольуется для инициализации
@@ -992,7 +994,7 @@ class VariableClProfileData(ReadonlyTableVariable):
         arch = self.Get('os_arch_machine_gentoo')
         return [x for x in profiles if x.arch == arch]
 
-    def get(self, hr=False):
+    def get(self, hr=HumanReadable.No):
         rep = self.Get(self.repository)
         if not rep:
             return [[]]

pym/update/wsdl_update.py

@@ -21,7 +21,7 @@ from calculate.lib.datavars import VariableError,DataVarsError
 from calculate.core.server.func import WsdlBase
 from calculate.install.install import InstallError
 from calculate.update.update import Update, UpdateError
-from calculate.lib.utils.portage import GitError
+from calculate.lib.utils.git import GitError
 from utils.cl_update import ClUpdateAction
 from utils.cl_update_profile import ClUpdateProfileAction
 from utils.cl_setup_update import ClSetupUpdateAction