complete typing for destroy functions

This patch is an addendum to #157 (Resource is an abstract class, be clear about it)

Author: igalic

iocage/cli/destroy.py

@@ -64,7 +64,10 @@ def cli(ctx,
         logger.error("No filter specified - cannot select a target to delete")
         exit(1)
 
-    resources_class: typing.Type[iocage.lib.Resource.Resource]
+    resources_class: typing.Union[
+        typing.Type[iocage.lib.Releases.ReleasesGenerator],
+        typing.Type[iocage.lib.Jails.JailsGenerator]
+    ]
     if release is True:
         resources_class = iocage.lib.Releases.ReleasesGenerator
     else:

iocage/cli/list.py

@@ -135,7 +135,7 @@ def _print_table(
     ],
     columns: list,
     show_header: bool,
-    sort_key: str=None
+    sort_key: typing.Optional[str]=None
 ) -> None:
 
     table = texttable.Texttable(max_width=0)

iocage/lib/Releases.py

@@ -76,7 +76,7 @@ def _create_resource_instance(
         dataset: libzfs.ZFSDataset,
         *args,
         **kwargs
-    ) -> 'iocage.lib.Release.ReleaseGenerator':
+    ) -> iocage.lib.Release.ReleaseGenerator:
 
         kwargs["name"] = self._get_asset_name_from_dataset(dataset)
         kwargs["logger"] = self.logger

iocage/lib/Resource.py

@@ -92,10 +92,10 @@ def __init__(
         self,
         dataset: typing.Optional[libzfs.ZFSDataset]=None,
         dataset_name: typing.Optional[str]=None,
-        config_type: typing.Optional[str]="auto",  # auto, json, zfs, ucl
-        config_file: str=None,  # 'config.json', 'config', etc
-        logger: 'iocage.lib.Logger.Logger'=None,
-        zfs: 'iocage.lib.ZFS.ZFS'=None
+        config_type: str="auto",  # auto, json, zfs, ucl
+        config_file: typing.Optional[str]=None,  # 'config.json', 'config', etc
+        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
+        zfs: typing.Optional[iocage.lib.ZFS.ZFS]=None
     ) -> None:
 
         self.logger = iocage.lib.helpers.init_logger(self, logger)
@@ -310,9 +310,9 @@ class DefaultResource(Resource):
 
     def __init__(
         self,
-        dataset: libzfs.ZFSDataset=None,
-        logger: 'iocage.lib.Logger.Logger'=None,
-        zfs: 'iocage.lib.ZFS.ZFS'=None
+        dataset: typing.Optional[libzfs.ZFSDataset]=None,
+        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
+        zfs: typing.Optional[iocage.lib.ZFS.ZFS]=None
     ) -> None:
 
         Resource.__init__(
@@ -335,21 +335,20 @@ def save(self) -> None:
 
 class ListableResource(list, Resource):
 
-    _filters: 'iocage.lib.Filter.Terms' = None
+    _filters: typing.Optional[iocage.lib.Filter.Terms] = None
 
     def __init__(
         self,
-        dataset: libzfs.ZFSDataset=None,
-        filters: 'iocage.lib.Filter.Terms'=None,
-        logger: 'iocage.lib.Logger.Logger'=None,
-        zfs: 'iocage.lib.ZFS.ZFS'=None,
+        dataset: typing.Optional[libzfs.ZFSDataset]=None,
+        filters: typing.Optional[iocage.lib.Filter.Terms]=None,
+        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
+        zfs: typing.Optional[iocage.lib.ZFS.ZFS]=None,
     ) -> None:
 
         list.__init__(self, [])
 
         Resource.__init__(
             self,
-            config_type=None,
             dataset=dataset,
             logger=logger,
             zfs=zfs
@@ -367,13 +366,15 @@ def __iter__(
         for child_dataset in self.dataset.children:
 
             name = self._get_asset_name_from_dataset(child_dataset)
-            if self._filters.match_key("name", name) is not True:
+            if self._filters is not None and \
+               self._filters.match_key("name", name) is not True:
                 # Skip all jails that do not even match the name
                 continue
 
             # ToDo: Do not load jail if filters do not require to
             resource = self._get_resource_from_dataset(child_dataset)
-            if self._filters.match_resource(resource):
+            if self._filters is not None and \
+               self._filters.match_resource(resource):
                 yield resource
 
     def _get_asset_name_from_dataset(
@@ -403,21 +404,19 @@ def filters(self):
     @filters.setter
     def filters(
         self,
-        value: typing.Iterable[typing.Union['iocage.lib.Filter.Term', str]]
+        value: typing.Iterable[typing.Union[iocage.lib.Filter.Term, str]]
     ):
 
         if isinstance(value, iocage.lib.Filter.Terms):
             self._filters = value
         else:
             self._filters = iocage.lib.Filter.Terms(value)
 
+    @abc.abstractmethod
     def _create_resource_instance(
         self,
         dataset: libzfs.ZFSDataset,
         *args,
         **kwargs
     ):
-
-        raise NotImplementedError(
-            "This needs to be implemented by the inheriting class"
-        )
+        pass