Make pre-check happy

vzhestkov · vzhestkov · commit 88ede53acc82 · 2025-04-11T12:05:13.000+02:00
diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py
@@ -45,11 +45,11 @@
 )
 from salt.modules.cmdmod import _parse_env
 from salt.utils.pkg.deb import (
-    _invalid,
     Deb822SourceEntry,
     Section,
     SourceEntry,
     SourcesList,
+    _invalid,
 )
 from salt.utils.versions import warn_until_date
 
@@ -2661,7 +2661,9 @@ def mod_repo(repo, saltenv="base", aptkey=True, **kwargs):
     if not mod_source:
         apt_source_file = kwargs.get("file")
         if not apt_source_file:
-            raise SaltInvocationError("missing 'file' argument when defining a new repository")
+            raise SaltInvocationError(
+                "missing 'file' argument when defining a new repository"
+            )
 
         if not apt_source_file.endswith(".list"):
             section = Section("")
diff --git a/salt/utils/pkg/deb.py b/salt/utils/pkg/deb.py
@@ -18,6 +18,9 @@
 
 
 def string_to_bool(s):
+    """
+    Convert string representation of bool values to integer
+    """
     s = s.lower()
     if s in ("no", "false", "without", "off", "disable"):
         return 0
@@ -162,9 +165,7 @@ def __init__(self, key, doc):
         self.key = key
         self.__doc__ = doc
 
-    def __get__(
-        self, obj, objtype = None
-    ):
+    def __get__(self, obj, objtype=None):
         if obj is None:
             return self
         return obj.section.get(self.key, None)
@@ -181,9 +182,7 @@ def __init__(self, key, doc):
         self.key = key
         self.__doc__ = doc
 
-    def __get__(
-        self, obj, objtype = None
-    ):
+    def __get__(self, obj, objtype=None):
         if obj is None:
             return self
         return SourceEntry.mysplit(obj.section.get(self.key, ""))
@@ -199,7 +198,7 @@ def __init__(self, parent):
     def __get__(
         self,
         obj,
-        objtype = None,
+        objtype=None,
     ):
         if obj is None:
             return self
@@ -211,6 +210,7 @@ def __set__(self, obj, value):
 
 
 def DeprecatedProperty(prop):
+    """Wrapper to mark deprecated properties"""
     return prop
 
 
@@ -224,7 +224,7 @@ def __init__(
         self,
         section,
         file,
-        list = None,
+        list=None,
     ):
         if section is None:
             self.section = Section("")
@@ -344,8 +344,7 @@ def merge(self, other):
         if not isinstance(other, Deb822SourceEntry):
             return False
         if self.comment != other.comment and not any(
-            "Added by software-properties" in c
-            for c in (self.comment, other.comment)
+            "Added by software-properties" in c for c in (self.comment, other.comment)
         ):
             return False
 
@@ -564,7 +563,7 @@ def file(self):
 class SourceEntry:
     """single sources.list entry"""
 
-    def __init__(self, line, file = None):
+    def __init__(self, line, file=None):
         self.invalid = False  # is the source entry valid
         self.disabled = False  # is it disabled ('#' in front)
         self.type = ""  # what type (deb, deb-src)
@@ -579,9 +578,7 @@ def __init__(self, line, file = None):
         if file is None:
             file = _APT_SOURCES_LIST
         if file.endswith(".sources"):
-            raise ValueError(
-                "Classic SourceEntry cannot be written to .sources file"
-            )
+            raise ValueError("Classic SourceEntry cannot be written to .sources file")
         self.file = file  # the file that the entry is located in
         self._parse_sources(line)
         self.template = None  # type DistInfo.Suite
@@ -778,9 +775,7 @@ def __iter__(self):
         types"""
         yield from self.list
 
-    def __find(
-        self, *predicates, **attrs
-    ):
+    def __find(self, *predicates, **attrs):
         uri = attrs.pop("uri", None)
         for source in self.exploded_list():
             if uri and source.uri and uri.rstrip("/") != source.uri.rstrip("/"):
@@ -910,9 +905,7 @@ def load(self, file):
             with open(file) as f:
                 if file.endswith(".sources"):
                     for section in File(f):
-                        self.list.append(
-                            Deb822SourceEntry(section, file, list=self)
-                        )
+                        self.list.append(Deb822SourceEntry(section, file, list=self))
                 else:
                     for line in f:
                         source = SourceEntry(line, file)
@@ -996,9 +989,7 @@ def exploded_list(self):
                 for typ in entry.types:
                     for uri in entry.uris:
                         for sui in entry.suites:
-                            res.append(
-                                ExplodedDeb822SourceEntry(entry, typ, uri, sui)
-                            )
+                            res.append(ExplodedDeb822SourceEntry(entry, typ, uri, sui))
 
         return res
 
