main/itstool: fix insufficiently quoted regular expressions for Python 3.12

This commit is contained in:
Holger Jaekel 2024-05-19 10:30:14 +02:00 committed by Natanael Copa
parent aea8bdaf89
commit d8e6236a18
2 changed files with 78 additions and 1 deletions

View file

@ -0,0 +1,75 @@
Patch-Source: https://github.com/itstool/itstool/pull/51/commits/32c7d07664dc37765100285d1202d488cd6a27e8
--
From 32c7d07664dc37765100285d1202d488cd6a27e8 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Mon, 9 Oct 2023 14:26:43 +0200
Subject: [PATCH] Fix insufficiently quoted regular expressions
These went under the radar until Python 3.12 started warning about them.
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
---
itstool.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/itstool.in b/itstool.in
index c21ad4b..4452616 100755
--- a/itstool.in
+++ b/itstool.in
@@ -220,7 +220,7 @@ class Message (object):
if not isinstance(text, ustr_type):
text = ustr(text, 'utf-8')
self._message[-1] += text.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
- if re.sub('\s+', ' ', text).strip() != '':
+ if re.sub(r'\s+', ' ', text).strip() != '':
self._empty = False
def add_entity_ref (self, name):
@@ -318,7 +318,7 @@ class Message (object):
message += '<_:%s-%i/>' % (msg.name, placeholder)
placeholder += 1
if not self._preserve:
- message = re.sub('\s+', ' ', message).strip()
+ message = re.sub(r'\s+', ' ', message).strip()
return message
def get_preserve_space (self):
@@ -456,9 +456,9 @@ class LocNote (object):
if self._preserve_space:
return self.locnote
else:
- return re.sub('\s+', ' ', self.locnote).strip()
+ return re.sub(r'\s+', ' ', self.locnote).strip()
elif self.locnoteref is not None:
- return '(itstool) link: ' + re.sub('\s+', ' ', self.locnoteref).strip()
+ return '(itstool) link: ' + re.sub(r'\s+', ' ', self.locnoteref).strip()
return ''
@@ -889,7 +889,7 @@ class Document (object):
trans = translations.ugettext('_\x04translator-credits')
if trans is None or trans == 'translator-credits':
return
- regex = re.compile('(.*) \<(.*)\>, (.*)')
+ regex = re.compile(r'(.*) \<(.*)\>, (.*)')
for credit in trans.split('\n'):
match = regex.match(credit)
if not match:
@@ -924,7 +924,7 @@ class Document (object):
prevnode = None
if node.prev is not None and node.prev.type == 'text':
prevtext = node.prev.content
- if re.sub('\s+', '', prevtext) == '':
+ if re.sub(r'\s+', '', prevtext) == '':
prevnode = node.prev
for lang in sorted(list(translations.keys()), reverse=True):
locale = self.get_its_locale_filter(node)
@@ -1468,7 +1468,7 @@ def match_locale(extrange, locale):
localei += 1
return True
-_locale_pattern = re.compile('([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?')
+_locale_pattern = re.compile(r'([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?')
def convert_locale (locale):
# Automatically convert POSIX-style locales to BCP47
match = _locale_pattern.match(locale)

View file

@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=itstool
pkgver=2.0.7
pkgrel=1
pkgrel=2
pkgdesc="ITS-based XML translation tool"
url="https://itstool.org/"
arch="noarch"
@ -12,6 +12,7 @@ checkdepends="diffutils gettext"
subpackages="$pkgname-doc"
source="https://github.com/itstool/itstool/archive/$pkgver/itstool-$pkgver.tar.gz
fix-segfault.patch
10-python_3.12.patch
"
options="net" # Tests require network access
@ -43,4 +44,5 @@ package() {
sha512sums="
03f16486336add31d24e74554fcb22f5ec00e0db63f890fb94d4a4561048b7aecaadd86d9ab7489a1b5f7adf180ce1b27131db928488e4e6ffe9444eee38a2e9 itstool-2.0.7.tar.gz
a47ab86ee0ea7b8fa8329649cda28db91e106ffdc695836e55f274b406759e3945835dbaf32230a30f2afaf482aff0ef205a12d722a19a6ab874c8f33413df9a fix-segfault.patch
f0dfc13b370083a3e9bc8feaa9e5ff732b41273d936841d6ced2d8acbeb4775d33f7dc6f47a1a94936091c1366a4b686d94bd8d4f12845f332a35514b1ed4c8c 10-python_3.12.patch
"