diff options
author | Carsten Schoenert <c.schoenert@t-online.de> | 2023-11-05 10:28:49 +0100 |
---|---|---|
committer | Thomas Lange <lange@debian.org> | 2023-12-02 16:47:03 +0100 |
commit | a11df196037746acd3cf862131d6a7d86f70f9f0 (patch) | |
tree | fb0f4588c6ce56cb138ff34afa2242564c1bf0f8 /english/security/oval | |
parent | 34189b78de59c093b5d202db5e139d276114a8b6 (diff) |
dsa.py: Use lazy % formatting in logging functions
Diffstat (limited to 'english/security/oval')
-rw-r--r-- | english/security/oval/oval/parser/dsa.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/english/security/oval/oval/parser/dsa.py b/english/security/oval/oval/parser/dsa.py index 3e62512cd18..de16f6e8bfa 100644 --- a/english/security/oval/oval/parser/dsa.py +++ b/english/security/oval/oval/parser/dsa.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # oval.parser.dsa - module to parse Debian Security Advisories files. # -# Extrected tags: +# Extracted tags: # <pagetitle> # <report_date> # <secrefs> @@ -42,7 +42,7 @@ def parseFile (path): filename = os.path.basename (path) dsa = os.path.basename(path)[:-5] - logging.log (logging.DEBUG, "Parsing DSA %s from file %s" % (dsa, filename)) + logging.log (logging.DEBUG, "Parsing DSA %s from file %s", dsa, filename) dsaFile = open(path, encoding="ISO-8859-2") @@ -59,32 +59,32 @@ def parseFile (path): result = descrpatern.search (line) if result: data["title"] = result.groups()[0] - logging.debug(".. extracted page title: " + data["title"]) + logging.debug(".. extracted page title: %s", data["title"]) continue refspatern = re.compile (r'secrefs>(.*?)</define-tag>') result = refspatern.search (line) if result: data["secrefs"] = [str(s) for s in re.split(r'\s+', result.groups()[0])] - logging.debug(".. extracted security references: %s" % (data["secrefs"],)) + logging.debug(".. extracted security references: %s", data["secrefs"]) pakpatern = re.compile (r'packages>(.*?)</define-tag>') result = pakpatern.search (line) if result: data["packages"] = result.groups()[0] - logging.debug(".. extracted packages: " + data["packages"]) + logging.debug(".. extracted packages: %s", data["packages"]) vulpatern = re.compile (r'isvulnerable>(.*?)</define-tag>') result = vulpatern.search (line) if result: data["vulnerable"] = result.groups()[0] - logging.debug(".. extracted vulnerable: " + data["vulnerable"]) + logging.debug(".. extracted vulnerable: %s", data["vulnerable"]) fixpatern = re.compile (r'fixed>(.*?)</define-tag>') result = fixpatern.search (line) if result: data["fixed"] = result.groups()[0] - logging.debug(".. extracted fixed: " + data["fixed"]) + logging.debug(".. extracted fixed: %s", data["fixed"]) versionpatern = re.compile (r'<h3>Debian GNU/Linux (\d.\d) \((.*?)\)</h3>') result = versionpatern.search (line) @@ -102,7 +102,7 @@ def parseFile (path): fdeb_ver = None if "release" in data: if deb_ver in data["release"]: - logging.warning("DSA %s: Found second files section for release %s" % (dsa, deb_ver)) + logging.warning("DSA %s: Found second files section for release %s", dsa, deb_ver) else: data["release"][deb_ver] = {} else: @@ -123,7 +123,7 @@ def parseFile (path): else: data["release"][deb_ver][architecture] = {package : version} - logging.debug("... found dsa data: %s" % data ) + logging.debug("... found dsa data: %s", data) if "title" in data: return data["title"], data |