WIP: flake8 green

Author: gronke

iocage/lib/Config/Dataset.py

@@ -50,7 +50,7 @@ def dataset(self) -> libzfs.ZFSDataset:
 
     @property
     def file(self) -> str:
-        return os.path.join(self.dataset.mountpoint, self._file)
+        return str(os.path.join(self.dataset.mountpoint, self._file))
 
     @file.setter
     def file(self, value: str):

iocage/lib/Config/Jail/BaseConfig.py

@@ -71,7 +71,7 @@ class BaseConfig(dict):
         'iocage.lib.Config.Jail.'
         'JailConfigProperties.JailConfigProperties'
     )
-    data: dict
+    data: typing.Dict[str, typing.Any]
 
     def __init__(
         self,
@@ -291,7 +291,7 @@ def _set_clonejail(
 
     def _get_defaultrouter(self) -> typing.Optional[str]:
         value = self.data['defaultrouter']
-        return value if (value != "none" and value is not None) else None
+        return str(value) if (value != "none" and value is not None) else None
 
     def _set_defaultrouter(
         self,
@@ -304,7 +304,7 @@ def _set_defaultrouter(
 
     def _get_defaultrouter6(self) -> typing.Optional[str]:
         value = self.data['defaultrouter6']
-        return value if (value != "none" and value is not None) else None
+        return str(value) if (value != "none" and value is not None) else None
 
     def _set_defaultrouter6(
         self,
@@ -331,7 +331,8 @@ def _set_vnet(
 
     def _get_jail_zfs_dataset(self) -> typing.List[str]:
         try:
-            return self.data["jail_zfs_dataset"].split()
+            jail_zfs_dataset = str(self.data["jail_zfs_dataset"])
+            return jail_zfs_dataset.split()
         except KeyError:
             return []
 
@@ -360,17 +361,20 @@ def _set_jail_zfs(self, value, **kwargs):
             false="off"
         )
 
-    def _get_cloned_release(self):
+    def _get_cloned_release(self) -> typing.Optional[str]:
         try:
-            return self.data["cloned_release"]
+            return str(self.data["cloned_release"])
         except:
-            return self["release"]
+            release = self["release"]
+            if isinstance(release, str):
+                return str(self["release"])
+            return None
 
-    def _get_basejail_type(self):
+    def _get_basejail_type(self) -> typing.Optional[str]:
 
         # first see if basejail_type was explicitly set
         if "basejail_type" in self.data.keys():
-            return self.data["basejail_type"]
+            return str(self.data["basejail_type"])
 
         # if it was not, the default for is 'nullfs' if the jail is a basejail
         try:
@@ -478,10 +482,8 @@ def __setitem__(
         setter_method_name = f"_set_{key}"
         if setter_method_name in self.__dir__():
             setter_method = self.__getattribute__(setter_method_name)
-            if setter_method is None:
-                return None
-            else:
-                return setter_method(parsed_value, **kwargs)
+            setter_method(parsed_value, **kwargs)
+            return
 
         self.data[key] = parsed_value
 
@@ -526,14 +528,14 @@ def set(self, key: str, value: typing.Any, **kwargs) -> bool:
         if existed_before != exists_after:
             return True
 
-        return (hash_before != hash_after)
+        return (hash_before != hash_after) is True
 
     @property
-    def user_data(self) -> dict:
+    def user_data(self) -> typing.Dict[str, typing.Any]:
         return self.data
 
     def __str__(self) -> str:
-        return iocage.lib.helpers.to_json(self.data)
+        return str(iocage.lib.helpers.to_json(self.data))
 
     def __dir__(self) -> list:
 

iocage/lib/Config/Jail/Defaults.py

@@ -25,9 +25,6 @@
 
 import iocage.lib.Config.Jail.BaseConfig
 
-# mypy
-import iocage.lib.logger
-
 
 class DefaultsUserData(dict):
 
@@ -121,7 +118,7 @@ class JailConfigDefaults(iocage.lib.Config.Jail.BaseConfig.BaseConfig):
 
     def __init__(
         self,
-        logger: typing.Optional[iocage.lib.Logger.Logger]=None
+        logger: typing.Optional['iocage.lib.Logger.Logger']=None
     ) -> None:
 
         self._user_data = DefaultsUserData(

iocage/lib/Config/Jail/File/Fstab.py

@@ -28,11 +28,6 @@
 import iocage.lib.helpers
 import iocage.lib.Config.Jail.File.Prototype
 
-# MyPy
-import iocage.lib.Resource
-import iocage.lib.Jail
-import iocage.lib.Release
-
 
 class FstabLine(dict):
 
@@ -73,7 +68,7 @@ def __init__(self, data: dict) -> None:
         self["line"] = data["line"]
 
     def __str__(self) -> str:
-        return self["line"]
+        return str(self["line"])
 
     def __hash__(self):
         return hash(uuid.uuid4().hex)
@@ -105,17 +100,17 @@ class Fstab(list, iocage.lib.Config.Jail.File.Prototype.ResourceConfigFile):
     """
     AUTO_COMMENT_IDENTIFIER = "iocage-auto"
 
-    release: typing.Optional[iocage.lib.Release.ReleaseGenerator]
-    host: iocage.lib.Host.HostGenerator
-    logger: iocage.lib.Logger.Logger
-    jail: iocage.lib.Jail.JailGenerator
+    release: typing.Optional['iocage.lib.Release.ReleaseGenerator']
+    host: 'iocage.lib.Host.HostGenerator'
+    logger: 'iocage.lib.Logger.Logger'
+    jail: 'iocage.lib.Jail.JailGenerator'
 
     def __init__(
         self,
-        jail: iocage.lib.Jail.JailGenerator,
-        release: typing.Optional[iocage.lib.Release.ReleaseGenerator]=None,
-        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
-        host: typing.Optional[iocage.lib.Host.HostGenerator]=None
+        jail: 'iocage.lib.Jail.JailGenerator',
+        release: typing.Optional['iocage.lib.Release.ReleaseGenerator']=None,
+        logger: typing.Optional['iocage.lib.Logger.Logger']=None,
+        host: typing.Optional['iocage.lib.Host.HostGenerator']=None
     ) -> None:
 
         self.logger = iocage.lib.helpers.init_logger(self, logger)
@@ -253,7 +248,7 @@ def update_and_save(
 
     def update_release(
         self,
-        release: typing.Optional[iocage.lib.Release.ReleaseGenerator] = None
+        release: typing.Optional['iocage.lib.Release.ReleaseGenerator'] = None
     ) -> None:
         """
         Set a new release and save the updated file
@@ -345,7 +340,14 @@ def __iter__(self):
         basejails. The previous position of auto-created entries is preserved.
         """
         basejail_lines_added = False
-        output = []
+        output: typing.List[
+            typing.Union[
+                FstabAutoPlaceholderLine,
+                FstabCommentLine,
+                FstabLine
+            ]
+        ] = []
+
         for line in list.__iter__(self):
             if isinstance(line, FstabAutoPlaceholderLine):
                 output += self.basejail_lines
@@ -367,9 +369,9 @@ def __contains__(self, value: typing.Any) -> bool:
         return False
 
 
-def _is_comment_line(text: str):
-    return text.strip().startswith("#")
+def _is_comment_line(text: str) -> bool:
+    return text.strip().startswith("#") is True
 
 
-def _is_empty_line(text: str):
-    return text.strip() == ""
+def _is_empty_line(text: str) -> bool:
+    return (text.strip() == "") is True

iocage/lib/Config/Jail/File/RCConf.py

@@ -30,7 +30,6 @@
 import iocage.lib.Config.Jail.File.Prototype
 
 # MyPy
-import iocage.lib.LaunchableResource
 import iocage.lib.Logger
 
 
@@ -44,9 +43,9 @@ class RCConf(
 
     def __init__(
         self,
-        resource: iocage.lib.LaunchableResource.LaunchableResource,
+        resource: 'iocage.lib.LaunchableResource.LaunchableResource',
         file: typing.Optional[str]=None,
-        logger: typing.Optional[iocage.lib.Logger.Logger]=None
+        logger: typing.Optional['iocage.lib.Logger.Logger']=None
     ) -> None:
 
         dict.__init__(self, {})
@@ -140,7 +139,7 @@ def _read_file(
             self._file_content_changed = False
 
     def _read(self, silent=False) -> dict:
-        data = ucl.load(open(self.path).read())
+        data = dict(ucl.load(open(self.path).read()))
         self.logger.spam(f"rc.conf was read from {self.path}")
         return data
 

iocage/lib/Config/Jail/JailConfig.py

@@ -26,27 +26,23 @@
 import iocage.lib.helpers
 import iocage.lib.Config.Jail.BaseConfig
 
-# MyPy
-import iocage.lib.Jail
-import iocage.lib.Logger
-import iocage.lib.Host
 
 _usp = iocage.lib.Config.Jail.BaseConfig.BaseConfig.update_special_property
 
 
 class JailConfig(iocage.lib.Config.Jail.BaseConfig.BaseConfig):
 
     legacy: bool = False
-    jail: typing.Optional[iocage.lib.Jail.JailGenerator]
+    jail: typing.Optional['iocage.lib.Jail.JailGenerator']
     data: dict = {}
 
     def __init__(
         self,
         data: dict={},
-        jail: typing.Optional[iocage.lib.Jail.JailGenerator]=None,
+        jail: typing.Optional['iocage.lib.Jail.JailGenerator']=None,
         new: bool=False,
-        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
-        host: typing.Optional[iocage.lib.Host.HostGenerator]=None
+        logger: typing.Optional['iocage.lib.Logger.Logger']=None,
+        host: typing.Optional['iocage.lib.Host.HostGenerator']=None
     ) -> None:
 
         iocage.lib.Config.Jail.BaseConfig.BaseConfig.__init__(

iocage/lib/Config/Jail/Properties/Addresses.py

@@ -32,12 +32,12 @@
 
 class AddressSet(set):
 
-    config: iocage.lib.Config.Jail.JailConfig.JailConfig
+    config: 'iocage.lib.Config.Jail.JailConfig.JailConfig'
 
     def __init__(
         self,
         config: typing.Optional[
-            iocage.lib.Config.Jail.JailConfig.JailConfig
+            'iocage.lib.Config.Jail.JailConfig.JailConfig'
         ]=None,
         property_name: str="ip4_address"
     ) -> None:
@@ -68,15 +68,17 @@ def __notify(self) -> None:
 class AddressesProp(dict):
 
     logger: iocage.lib.Logger.Logger
-    config: iocage.lib.Config.Jail.JailConfig.JailConfig
+    config: 'iocage.lib.Config.Jail.JailConfig.JailConfig'
     property_name: str = "ip4_address"
     skip_on_error: bool
 
     def __init__(
         self,
-        config=None,  # type: ignore
+        config: typing.Optional[
+            'iocage.lib.Config.Jail.BaseConfig.BaseConfig'
+        ]=None,
         property_name: str="ip4_address",
-        logger: typing.Optional[iocage.lib.Logger.Logger]=None,
+        logger: typing.Optional['iocage.lib.Logger.Logger']=None,
         skip_on_error: bool=False
     ) -> None:
 

iocage/lib/Config/Jail/Properties/Interfaces.py

@@ -25,17 +25,15 @@
 
 import iocage.lib.helpers
 
-_ConfigType = iocage.lib.Config.Jail.JailConfig.JailConfig
-
 
 class BridgeSet(set):
 
-    config: iocage.lib.Config.Jail.JailConfig.JailConfig
+    config: 'iocage.lib.Config.Jail.JailConfig.JailConfig'
 
     def __init__(
         self,
         config: typing.Optional[
-            iocage.lib.Config.Jail.JailConfig.JailConfig
+            'iocage.lib.Config.Jail.JailConfig.JailConfig'
         ]=None
     ) -> None:
 
@@ -60,13 +58,13 @@ def __notify(self) -> None:
 
 class InterfaceProp(dict):
 
-    config: iocage.lib.Config.Jail.JailConfig.JailConfig
+    config: 'iocage.lib.Config.Jail.JailConfig.JailConfig'
     property_name: str = "interfaces"
 
     def __init__(
         self,
         config: typing.Optional[
-            iocage.lib.Config.Jail.JailConfig.JailConfig
+            'iocage.lib.Config.Jail.JailConfig.JailConfig'
         ]=None,
         **kwargs
     ) -> None:

iocage/lib/Config/Jail/Properties/Resolver.py

@@ -30,9 +30,10 @@
 # mypy
 import iocage.lib.Logger
 
+
 class ResolverProp(list):
 
-    config: iocage.lib.Config.Jail.JailConfig.JailConfig
+    config: 'iocage.lib.Config.Jail.JailConfig.JailConfig'
     property_name: str = "resolver"
 
     def __init__(
@@ -70,7 +71,7 @@ def _get_method(self, value: typing.Any) -> str:
 
     @property
     def value(self) -> str:
-        return self.config.data["resolver"]
+        return str(self.config.data["resolver"])
 
     def apply(self, jail):
         self.logger.verbose(

iocage/lib/Config/Prototype.py

@@ -53,7 +53,7 @@ def file(self, value: str):
             "This needs to be implemented by the inheriting class"
         )
 
-    def read(self) -> dict:
+    def read(self):
         try:
             with open(self.file, "r") as data:
                 return self.map_input(data)
@@ -68,11 +68,15 @@ def write(self, data: dict) -> None:
             conf.write(self.map_output(data))
             conf.truncate()
 
-    def map_input(self, data: typing.Any) -> typing.Dict[str, any]:
-        return data  # type: typing.Dict[str, any]
+    def map_input(self, data: typing.Any):
+        # result = data  # type: typing.Dict[str, typing.Any]
+        # return result
+        return data
 
-    def map_output(self, data: typing.Any) -> typing.Any:
-        return data  # type: typing.Dict[str, any]
+    def map_output(self, data: typing.Any):
+        # result = data  # type: typing.Dict[str, typing.Any]
+        # return result
+        return data
 
     def exists(self) -> bool:
         return os.path.isfile(self.file)