convert helpers/init_logger & init_zfs into pure functions

no need to modify self

Author: igalic

libiocage/lib/Datasets.py

@@ -31,9 +31,8 @@ class Datasets:
     ZFS_POOL_ACTIVE_PROPERTY = "org.freebsd.ioc:active"
 
     def __init__(self, root=None, pool=None, zfs=None, logger=None):
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
-
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         self._datasets = {}
 
         if isinstance(root, libzfs.ZFSDataset):

libiocage/lib/Distribution.py

@@ -48,12 +48,11 @@ class DistributionGenerator:
     mirror_link_pattern = r"a href=\"([A-z0-9\-_\.]+)/\""
 
     def __init__(self, host, zfs=None, logger=None):
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         libiocage.lib.helpers.init_host(self, host)
+
         self.available_releases = None
-        self.zfs = zfs
-        self.logger = logger
 
     @property
     def name(self):

libiocage/lib/Host.py

@@ -36,8 +36,8 @@ class HostGenerator:
 
     def __init__(self, root_dataset=None, zfs=None, logger=None):
 
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         self.datasets = libiocage.lib.Datasets.Datasets(
             root=root_dataset,
             logger=self.logger,

libiocage/lib/Jail.py

@@ -104,8 +104,9 @@ def __init__(self, data={}, zfs=None, host=None, logger=None, new=False):
 
         """
 
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
+
         libiocage.lib.helpers.init_host(self, host)
 
         if isinstance(data, str):

libiocage/lib/JailConfig.py

@@ -79,8 +79,7 @@ def __init__(self,
 
         dict.__init__(self)
 
-        libiocage.lib.helpers.init_logger(self, logger)
-
+        self.logger = libiocage.lib.helpers.init_logger(logger)
         self.data = {}
         self.special_properties = {}
 

libiocage/lib/JailConfigFstab.py

@@ -45,7 +45,7 @@ class JailConfigFstab(set):
 
     def __init__(self, jail, logger=None):
         set.__init__(self)
-        libiocage.lib.helpers.init_logger(self, logger)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
         self.jail = jail
 
     @property

libiocage/lib/JailConfigResolver.py

@@ -29,7 +29,7 @@
 class JailConfigResolver(list):
     def __init__(self, jail_config, logger=None):
         list.__init__(self, [])
-        libiocage.lib.helpers.init_logger(self, logger)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
         self.jail_config = jail_config
         self.jail_config.attach_special_property(
             name="resolver",

libiocage/lib/Jails.py

@@ -46,9 +46,11 @@ def __init__(self,
                  logger=None,
                  zfs=None):
 
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
         libiocage.lib.helpers.init_host(self, host)
+
+        # this could be wrong..er.. now?:
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         self.zfs = libzfs.ZFS(history=True, history_prefix="<iocage>")
 
         self._filters = None

libiocage/lib/Network.py

@@ -38,7 +38,7 @@ def __init__(self, jail,
                  bridges=None,
                  logger=None):
 
-        libiocage.lib.helpers.init_logger(self, logger)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
 
         if bridges is not None:
             if not isinstance(bridges, list):

libiocage/lib/RCConf.py

@@ -32,7 +32,7 @@ class RCConf(dict):
     def __init__(self, path, data={}, logger=None, jail=None):
 
         dict.__init__(self, {})
-        libiocage.lib.helpers.init_logger(self, logger=logger)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
         self.jail = jail
 
         # No file was loaded yet, so we can't know the delta yet

libiocage/lib/Release.py

@@ -56,8 +56,8 @@ def __init__(self, name=None,
                  check_hashes=True,
                  eol=False):
 
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         libiocage.lib.helpers.init_host(self, host)
 
         if not libiocage.lib.helpers.validate_name(name):

libiocage/lib/Storage.py

@@ -35,9 +35,8 @@ def __init__(self, jail,
                  safe_mode=True,
                  logger=None):
 
-        libiocage.lib.helpers.init_logger(self, logger)
-        libiocage.lib.helpers.init_zfs(self, zfs)
-
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
         self.jail = jail
 
         # when auto_create is enabled, non-existing zfs volumes will be

libiocage/lib/helpers.py

@@ -25,18 +25,17 @@
 import subprocess
 import uuid
 
-import libzfs
-
 import libiocage.lib.Datasets
 import libiocage.lib.Host
 import libiocage.lib.Logger
+import libzfs
 
 
-def init_zfs(self, zfs):
+def init_zfs(zfs: libzfs.ZFS=None) -> libzfs.ZFS:
     if isinstance(zfs, libzfs.ZFS):
-        self.zfs = zfs
+        return zfs
     else:
-        self.zfs = get_zfs()
+        return get_zfs()
 
 
 def get_zfs():
@@ -65,12 +64,13 @@ def init_datasets(self, datasets=None):
         self.datasets = libiocage.lib.Datasets.Datasets()
 
 
-def init_logger(self, logger=None):
+def init_logger(
+        logger: 'libiocage.lib.Logger.Logger'=None
+) -> 'libiocage.lib.Logger.Logger':
     if logger is not None:
-        object.__setattr__(self, 'logger', logger)
+        return logger
     else:
-        new_logger = libiocage.lib.Logger.Logger()
-        object.__setattr__(self, 'logger', new_logger)
+        return libiocage.lib.Logger.Logger()
 
 
 def exec(command, logger=None, ignore_error=False):