fixed Build and code cleanup

pym/builder/build_storage.py

@@ -40,15 +40,15 @@ __ = getLazyLocalTranslate(_)
 UTF8 = 'utf-8'
 
 
-class Build(object):
+class Build():
     """
     Сборка
     """
 
-    class Status(object):
+    class Status():
         Worked, Registered, Removed, Broken, Unregistered = range(5)
 
-    class Parameter(object):
+    class Parameter():
         HashId = "hash"
         Directory = "directory"
         PkgDir = "pkgdir"
@@ -63,7 +63,7 @@ class Build(object):
         attrs = {'pkgdir': PkgDir,
                  'references': References}
 
-    class Branches(object):
+    class Branches():
         Stable = Git.Reference.Master
         Unstable = Git.Reference.Update
 
@@ -142,7 +142,7 @@ class Build(object):
         return True
 
 
-class BuildStorage(object):
+class BuildStorage():
     """
     Хранилище в котором находится информация о собираемом дистрибутиве
     """
@@ -225,8 +225,7 @@ class BuildStorage(object):
         :return:
         """
         ini = self._get_ini_with_lock()
-        hashes = [ini.get(x, Build.Parameter.HashId,
-                          fallback="").encode(UTF8) for x in ini]
+        hashes = [ini.get(x, Build.Parameter.HashId, fallback="") for x in ini]
         for fn in listDirectory(self.data_dir):
             if fn not in hashes:
                 try:
@@ -236,7 +235,7 @@ class BuildStorage(object):
 
     def __iter__(self):
         ini = self._get_ini_with_lock()
-        return iter(sorted([x.encode(UTF8) for x in ini if x != 'DEFAULT']))
+        return iter(sorted([x for x in ini if x != 'DEFAULT']))
 
     def clear_unmounted(self):
         """
@@ -245,9 +244,9 @@ class BuildStorage(object):
         :return:
         """
         with self.modify_ini() as ini:
-            dist_dirs = [(x.encode(UTF8),
+            dist_dirs = [(x,
                           ini.get(x, Build.Parameter.Directory,
-                                  fallback="").encode(UTF8))
+                                  fallback=""))
                          for x in ini.keys()]
             for k, v in dist_dirs:
                 if v is None or not isMount(v):

pym/builder/builder.py

@@ -87,7 +87,7 @@ class Builder(Update):
 
     """
 
-    class Method(object):
+    class Method():
         Prepare = "builder_prepare"
         Break = "builder_break"
         Update = "builder_update"
@@ -604,11 +604,11 @@ class Builder(Update):
 
     def regenCache(self, repname):
         with self.clVars.useDefaultModule("update"):
-            return super(Builder, self).regenCache(repname)
+            return super().regenCache(repname)
 
     def prepare_gpg(self):
         with self.clVars.useDefaultModule("update"):
-            return super(Builder, self).prepare_gpg()
+            return super().prepare_gpg()
 
     def getGit(self):
         chroot_path = self.clVars.Get('builder.cl_builder_path')
@@ -622,7 +622,7 @@ class Builder(Update):
     def syncRepositories(self, repname, fallback_sync=False,
                          clean_on_error=True):
         with self.clVars.useDefaultModule("update"):
-            return super(Builder, self).syncRepositories(
+            return super().syncRepositories(
                 repname, fallback_sync=fallback_sync,
                 clean_on_error=clean_on_error)
 
@@ -670,7 +670,7 @@ class Builder(Update):
             self.ListAction.Ask if not pretend else self.ListAction.OnlyShow,
             *params)
 
-    class ListAction(object):
+    class ListAction():
         Ask = "ask"
         OnlyShow = "only_show"
         ShowAndRun = "show_and_run"
@@ -829,7 +829,7 @@ class Builder(Update):
                                     "-1", *rebuild_list)
         return True
 
-    class Driver(object):
+    class Driver():
         Package = None
         Id = None
 
@@ -1493,7 +1493,7 @@ class Builder(Update):
                 bdeps = " --with-bdeps=n"
             return deo + bdeps
         else:
-            return super(Builder, self).get_default_emerge_opts()
+            return super().get_default_emerge_opts()
 
     def emerge(self, builder_path, use, *params):
         extra_params = [x for x in params if x.startswith("-")]
@@ -2202,7 +2202,7 @@ class Builder(Update):
     def update_binhost_list(self):
         self.invalidateVariables('cl_builder_linux_datavars')
         self.prepare_update_vars()
-        return super(Builder,self).update_binhost_list(
+        return super().update_binhost_list(
                      self.clVars.Get('cl_builder_linux_datavars'))
 
     def is_update_action(self, action):

pym/builder/drive_spool.py

@@ -26,7 +26,7 @@ setLocalTranslate('cl_builder3', sys.modules[__name__])
 __ = getLazyLocalTranslate(_)
 
 
-class DriveSpool(object):
+class DriveSpool():
     """
     Объект содержит спул устройств на которые можно устанавливать систему
     """

pym/builder/emerge_fetch.py

@@ -31,18 +31,18 @@ class EmergePackageFetch(EmergePackage):
 
 
 class EmergeFetcherError(Exception):
-    class FetchErrno(object):
+    class FetchErrno():
         Generic = 0
         Lock = 1
         NeedManually = 2
 
     def __init__(self, message, errno=FetchErrno.Generic, extension=""):
-        super(EmergeFetcherError, self).__init__(message)
+        super().__init__(message)
         self.errno = errno
         self.extension = extension
 
 
-class EmergeFetcher(object):
+class EmergeFetcher():
     _color_block = EmergeInformationBlock._color_block
     _new_line = EmergeInformationBlock._new_line
     re_fetching = re.compile(

pym/builder/utils/cl_builder_update.py

@@ -36,7 +36,7 @@ setLocalTranslate('cl_builder3', sys.modules[__name__])
 __ = getLazyLocalTranslate(_)
 
 
-class BuilderConditions(object):
+class BuilderConditions():
     @staticmethod
     def was_installed(pkg, task_name):
         def func(Get):

pym/builder/variables/action.py

@@ -22,7 +22,7 @@ from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_builder3', sys.modules[__name__])
 
 
-class Actions(object):
+class Actions():
     Prepare = "prepare"
     Image = "image"
     Break = "break"

pym/builder/variables/images.py

@@ -71,7 +71,7 @@ class VariableClBuilderSplash(ReadonlyVariable):
 
 class DataVarsBuilderImage(LinuxDataVars):
     def variables(self):
-        l = super(DataVarsBuilderImage, self).variables()
+        l = super().variables()
         return l + [
             builder.VariableClBuilderPath(),
             builder.VariableClBuilderKernel(),
@@ -338,12 +338,12 @@ class VariableClBuilderTimezone(GrubOptionVariable,
 class VariableClBuilderX11Resolution(
     GrubOptionVariable, X11.VariableOsInstallX11ResolutionPreferred):
     def choice(self):
-        values = super(VariableClBuilderX11Resolution, self).choice()
+        values = super().choice()
         return [("auto", _("Auto"))] + [(x, x) for x in values]
 
     def check(self, value):
         if value != "auto":
-            super(VariableClBuilderX11Resolution, self).check(value)
+            super().check(value)
 
 
 class VariableClBuilderX11Composite(GrubOptionVariable,

pym/builder/variables/linux.py

@@ -59,7 +59,7 @@ class DataVarsBuilderLinux(linux.LinuxDataVars):
     """
 
     def variables(self):
-        l = super(DataVarsBuilderLinux, self).variables()
+        l = super().variables()
         return l + [linux.VariableClProfileSystem(),
                     env.VariableClRepositoryData(),
                     env.VariableClRepositoryName(),

pym/builder/variables/profiles.py

@@ -158,7 +158,7 @@ class VariableClBuilderProfileName(lib_linux.VariableClProfileName):
             if isinstance(source, distr.ContainerDistributive):
                 return source.get_information().get("cl_profile_name",
                                                     _("Unknown"))
-        return super(VariableClBuilderProfileName, self).get()
+        return super().get()
 
 
 class VariableClBuilderProfileRepoName(update.VariableClUpdateProfileRepoName):