Pylint updates

Extend linelength to 120 in black.

1 files changed, 25 insertions, 36 deletions

diff --git a/bin/grab-cve-in-fix b/bin/grab-cve-in-fix
index 5d6068f54d..9a7db822f9 100755
--- a/bin/grab-cve-in-fix
+++ b/bin/grab-cve-in-fix
@@ -29,7 +29,7 @@ grab-cve-in-fix - #1001451
 #  MA 02110-1301, USA.
 #
 
-# pylint: disable=too-few-public-methods
+# pylint: disable=too-few-public-methods,line-too-long,too-many-instance-attributes,too-many-branches
 
 # Examples:
 # --archive https://lists.debian.org/debian-devel-changes/2021/12/msg01280.html
@@ -69,22 +69,20 @@ class ParseChanges:
         self.bugs = {}
         self.parsed = []
         self.unstable_version = None
-        self.tracker_base = (
-            "https://security-tracker.debian.org/tracker/source-package/"
-        )
+        self.tracker_base = "https://security-tracker.debian.org/tracker/source-package/"
         self.logger = logging.getLogger("grab-cve-in-fix")
         self.logger.setLevel(logging.DEBUG)
         # console logging
-        ch = logging.StreamHandler()
-        ch.setLevel(logging.DEBUG)
+        ch_log = logging.StreamHandler()
+        ch_log.setLevel(logging.DEBUG)
         formatter = logging.Formatter("%(name)s - %(levelname)s - %(message)s")
-        ch.setFormatter(formatter)
-        self.logger.addHandler(ch)
-        apt_pkg.init_system()
+        ch_log.setFormatter(formatter)
+        self.logger.addHandler(ch_log)
+        apt_pkg.init_system()  # pylint: disable=c-extension-no-member
 
     def _read_cvelist(self):
         os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-        data, _ = cvelist("data/CVE/list")
+        data, _ = cvelist("data/CVE/list")  # pylint: disable=no-value-for-parameter
         for cve in self.cves:
             for bug in data:
                 if bug.header.name == cve:
@@ -154,20 +152,18 @@ class ParseChanges:
                 if line.package != self.source_package:
                     continue  # allow for removed, old or alternate pkg names
                 if line.version:
-                    vc = apt_pkg.version_compare(line.version, self.unstable_version)
-                    if vc < 0:
-                        self.logger.info(
-                            "Updating %s to %s", line.version, self.unstable_version
-                        )
+                    vcompare = apt_pkg.version_compare(  # pylint: disable=c-extension-no-member
+                        line.version, self.unstable_version
+                    )
+                    if vcompare < 0:
+                        self.logger.info("Updating %s to %s", line.version, self.unstable_version)
                         mod_line = line._replace(version=self.unstable_version)
                         index = self.bugs[cve].annotations.index(line)
                         bug_list = list(self.bugs[cve].annotations)
                         bug_list[index] = mod_line
-                        mod_bug = Bug(
-                            self.bugs[cve].file, self.bugs[cve].header, tuple(bug_list)
-                        )
+                        mod_bug = Bug(self.bugs[cve].file, self.bugs[cve].header, tuple(bug_list))
                         modified.append(mod_bug)
-                    elif vc > 0:
+                    elif vcompare > 0:
                         self.logger.error(
                             "%s is listed as fixed in %s which is newer than %s",
                             cve,
@@ -186,16 +182,13 @@ class ParseChanges:
                     index = self.bugs[cve].annotations.index(line)
                     bug_list = list(self.bugs[cve].annotations)
                     bug_list[index] = mod_line
-                    mod_bug = Bug(
-                        self.bugs[cve].file, self.bugs[cve].header, tuple(bug_list)
-                    )
+                    mod_bug = Bug(self.bugs[cve].file, self.bugs[cve].header, tuple(bug_list))
                     modified.append(mod_bug)
         if not modified:
-            return
+            return 0
         if os.path.exists(cve_file):
             self.logger.critical("%s already exists", cve_file)
             return -1
-        mods = []
         for cve in modified:
             self.logger.info(
                 "Writing to ./%s with update for %s - %s %s",
@@ -206,6 +199,7 @@ class ParseChanges:
             )
         with open(cve_file, "a") as snippet:
             writecvelist(modified, snippet)
+        return 0
 
 
 class ParseSources(ParseChanges):
@@ -231,7 +225,7 @@ class ParseSources(ParseChanges):
         # self.url contains pkgdir which needs to contain Sources files
         os.chdir(self.url)
         for srcs_file in glob.glob("sid*Sources"):
-            srcs = sourcepackages(srcs_file)
+            srcs = sourcepackages(srcs_file)  # pylint: disable=no-value-for-parameter
             if srcs.get(self.source_package):
                 self.unstable_version = srcs[self.source_package].version
                 # src package is only listed in one Sources file
@@ -335,12 +329,10 @@ def main():
         description="Grab CVE data from a package upload for manual review",
         usage="%(prog)s [-h] [[--input] | [--archive URL] | [--tracker TRACKER]] | "
         "[[--src SRC] & [--cves [CVES ...]]]",
-        epilog="Data is written to a new <source_package>.list "
-        "file which can be used with './bin/merge-cve-files'",
+        epilog="Data is written to a new <source_package>.list " "file which can be used with './bin/merge-cve-files'",
     )
     online = parser.add_argument_group(
-        "Online - query one of distro-tracker or "
-        "debian-devel-changes mail archive or debian-devel-changes email"
+        "Online - query one of distro-tracker or " "debian-devel-changes mail archive or debian-devel-changes email"
     )
     online.add_argument(
         "--input",
@@ -358,16 +350,12 @@ def main():
     offline = parser.add_argument_group(
         "Offline - run 'make update-packages' first & specify source package and CVE list"
     )
-    offline.add_argument(
-        "--src", help="Source package name to look up version in local packages files"
-    )
+    offline.add_argument("--src", help="Source package name to look up version in local packages files")
     offline.add_argument(
         "--force-version",
         help="Explicitly set the fixed version, in case sid has moved ahead.",
     )
-    offline.add_argument(
-        "--cves", nargs="*", help="CVE ID tag with version from local packages files"
-    )
+    offline.add_argument("--cves", nargs="*", help="CVE ID tag with version from local packages files")
     args = parser.parse_args()
     if args.input:
         data = ParseDDStdIn(args.input)
@@ -386,7 +374,8 @@ def main():
         if args.force_version:
             data.unstable_version = args.force_version
         return data.parse()
-    self.logger.error("Unable to parse package data!")
+    logger = logging.getLogger("grab-cve-in-fix")
+    logger.error("Unable to parse package data!")
     return -1