Salvatore Bonaccorso pushed to branch master at Debian Security Tracker / security-tracker
Commits: 7db169b2 by Salvatore Bonaccorso at 2024-06-26T09:49:51+02:00 lib/python: Encode some regexp strings with r'' With python 3.12.y the DeprecationWarning is upgraded to a SyntaxWarning so these were now visible on a syntax-check when running under current unstable with python 3.12. Signed-off-by: Salvatore Bonaccorso <[email protected]> - - - - - 7abf38fe by Salvatore Bonaccorso at 2024-06-26T08:29:43+00:00 Merge branch 'syntax-warning-regexp' into 'master' lib/python: Encode some regexp strings with r'' See merge request security-tracker-team/security-tracker!179 - - - - - 2 changed files: - lib/python/bugs.py - lib/python/debian_support.py Changes: ===================================== lib/python/bugs.py ===================================== @@ -418,11 +418,11 @@ class FileBase(debian_support.PackageFile): re_xref_required = re.compile(r'^\{') re_xref = re.compile(r'^\{\s*([^\}]+?)\s*\}$') re_whitespace = re.compile(r'\s+') - re_xref_entry = re.compile('^(?:CVE-\d{4}-\d{4,}' + re_xref_entry = re.compile(r'^(?:CVE-\d{4}-\d{4,}' + r'|VU#\d{6}' + r'|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+|DLA-\d+-\d+)$') re_xref_entry_own = re.compile( - '^(?:CVE-\d{4}-\d{4,}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+|DLA-\d+-\d+)$') + r'^(?:CVE-\d{4}-\d{4,}|DSA-\d+(?:-\d+)?|DTSA-\d+-\d+|DLA-\d+-\d+)$') re_package_required = re.compile(r'^(?:\[.*\]\s*)?-') re_package_version = re.compile( @@ -838,7 +838,7 @@ class DSAFile(FileBase): self.base = os.path.basename(os.path.dirname(self.name)) self.re_dsa = re.compile(r'^\[(\d\d) ([A-Z][a-z][a-z]) (\d{4})\] ' - + r'(' + self.base + '-\d+(?:-\d+)?)\s+' + + r'(' + self.base + r'-\d+(?:-\d+)?)\s+' + r'(.*?)\s*$') month_names = {'Jan': 1, ===================================== lib/python/debian_support.py ===================================== @@ -383,7 +383,7 @@ def updateFile(remote, local, verbose=None): index_name = remote + '.diff/Index' - re_whitespace=re.compile('\s+') + re_whitespace=re.compile(r'\s+') try: index_url = urlopen(index_name, timeout=TIMEOUT) View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/eef40b590a6855780e4cf54972c3b5b7527d41e8...7abf38fe8aec355c1b05dba38022b992c4bde6de -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/eef40b590a6855780e4cf54972c3b5b7527d41e8...7abf38fe8aec355c1b05dba38022b992c4bde6de You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-security-tracker-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-security-tracker-commits
