complete typing for destroy functions

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

Author: igalic

iocage/cli/destroy.py

@@ -23,11 +23,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 """stop module for the cli."""
 import click
+import typing
 
+import iocage.lib.Filter
 import iocage.lib.Jail
 import iocage.lib.Jails
-import iocage.lib.Releases
 import iocage.lib.Logger
+import iocage.lib.Releases
 import iocage.lib.Resource
 
 __rootcmd__ = True
@@ -45,18 +47,24 @@
               help="Destroy the download dataset of the specified RELEASE as"
                    " well.")
 @click.argument("filters", nargs=-1)
-def cli(ctx, force, release, recursive, download, filters):
+def cli(ctx,
+        force: bool=False,
+        release: bool=False,
+        recursive: bool=False,
+        download: bool=False,
+        filters: typing.Optional[iocage.lib.Filter.Terms]=None) -> None:
     """
     Looks for the jail supplied and passes the uuid, path and configuration
     location to stop_jail.
     """
     logger = ctx.parent.logger
     host = iocage.lib.Host.Host(logger=logger)
 
-    if len(filters) == 0:
+    if filters is None or len(filters) == 0:
         logger.error("No filter specified - cannot select a target to delete")
         exit(1)
 
+    resources_class: typing.Type[iocage.lib.Resource.Resource]
     if release is True:
         resources_class = iocage.lib.Releases.ReleasesGenerator
     else:

iocage/lib/Jails.py

@@ -22,6 +22,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 import libzfs
+import typing
 
 import iocage.lib.Jail
 import iocage.lib.Filter
@@ -44,7 +45,7 @@ class JailsGenerator(iocage.lib.Resource.ListableResource):
 
     def __init__(
         self,
-        filters: iocage.lib.Filter.Terms=None,
+        filters: typing.Optional[iocage.lib.Filter.Terms]=None,
         host=None,
         logger=None,
         zfs=None

iocage/lib/Release.py

@@ -941,7 +941,7 @@ def _check_tar_info(self, tar_info, asset_name):
     def __str__(self):
         return self.name
 
-    def destroy(self):
+    def destroy(self, force: bool=False) -> None:
         self.storage.delete_dataset_recursive(self.dataset)
 
 

iocage/lib/Releases.py

@@ -23,8 +23,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 import iocage.lib.Release
 import iocage.lib.Resource
+import iocage.lib.Filter
 import iocage.lib.helpers
 
+import typing
+
 # MyPy
 import libzfs
 
@@ -35,7 +38,7 @@ class ReleasesGenerator(iocage.lib.Resource.ListableResource):
 
     def __init__(
         self,
-        filters: 'iocage.lib.Filter.Terms'=None,
+        filters: typing.Optional[iocage.lib.Filter.Terms]=None,
         host=None,
         zfs=None,
         logger=None

iocage/lib/Resource.py

@@ -126,7 +126,7 @@ def __init__(
             self.dataset = dataset
 
     @abc.abstractmethod
-    def destroy(self):
+    def destroy(self, force: bool=False) -> None:
         pass
 
     @property
@@ -326,7 +326,7 @@ def __init__(
             logger=logger
         )
 
-    def destroy(self):
+    def destroy(self, force: bool=False) -> None:
         raise NotImplementedError("destroy unimplemented for DefaultResource")
 
     def save(self) -> None:
@@ -357,12 +357,12 @@ def __init__(
 
         self.filters = filters
 
-    def destroy(self):
+    def destroy(self, force: bool=False) -> None:
         raise NotImplementedError("destroy unimplemented for ListableResource")
 
     def __iter__(
         self
-    ) -> typing.Generator['iocage.lib.Resource.Resource', None, None]:
+    ) -> typing.Generator[Resource, None, None]:
 
         for child_dataset in self.dataset.children: