From 395ea895b82f25add5131ef4129da095c4601e11 Mon Sep 17 00:00:00 2001 From: j Date: Wed, 22 Oct 2025 12:24:14 +0100 Subject: [PATCH] raw regexp strings --- pandora/annotation/models.py | 4 ++-- pandora/documentcollection/models.py | 2 +- pandora/edit/models.py | 2 +- pandora/entity/models.py | 4 ++-- pandora/item/timelines.py | 6 +++--- pandora/itemlist/models.py | 2 +- pandora/oxdjango/fields.py | 4 ++-- pandora/text/models.py | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pandora/annotation/models.py b/pandora/annotation/models.py index 9e31d184..452df4e0 100644 --- a/pandora/annotation/models.py +++ b/pandora/annotation/models.py @@ -74,7 +74,7 @@ def get_matches(obj, model, layer_type, qs=None): name = name.lower() name = ox.decode_html(name) name = unicodedata.normalize('NFKD', name).lower() - if name in value and (exact or re.compile('((^|\s)%s([\.,;:!?\'"\)\]\-\/\s]|$))' % re.escape(name)).findall(value)): + if name in value and (exact or re.compile(r'((^|\s)%s([\.,;:!?\'"\)\]\-\/\s]|$))' % re.escape(name)).findall(value)): matches.append(a.id) break if not matches: @@ -155,7 +155,7 @@ class Annotation(models.Model): self.sortvalue = sortvalue[:900] else: self.sortvalue = None - self.languages = ','.join(re.compile('lang="(.*?)"').findall(self.value)) + self.languages = ','.join(re.compile(r'lang="(.*?)"').findall(self.value)) if not self.languages: self.languages = None else: diff --git a/pandora/documentcollection/models.py b/pandora/documentcollection/models.py index be600b54..7c471ce2 100644 --- a/pandora/documentcollection/models.py +++ b/pandora/documentcollection/models.py @@ -188,7 +188,7 @@ class Collection(models.Model): self.status = value elif key == 'name': - data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() + data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip() if not data['name']: data['name'] = "Untitled" name = data['name'] diff --git a/pandora/edit/models.py b/pandora/edit/models.py index 94ad7a82..1ab58541 100644 --- a/pandora/edit/models.py +++ b/pandora/edit/models.py @@ -196,7 +196,7 @@ class Edit(models.Model): self.status = value elif key == 'name': - data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() + data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip() if not data['name']: data['name'] = "Untitled" name = data['name'] diff --git a/pandora/entity/models.py b/pandora/entity/models.py index e97a6963..d43444de 100644 --- a/pandora/entity/models.py +++ b/pandora/entity/models.py @@ -131,7 +131,7 @@ class Entity(models.Model): config_keys = {k['id']: k for k in entity['keys']} for key, value in data.items(): if key == 'name': - data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() + data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip() if not data['name']: data['name'] = "Unnamed" name = data['name'] @@ -147,7 +147,7 @@ class Entity(models.Model): names = [] for v in data[key]: name = ox.decode_html(v) - name = re.sub(' \[\d+\]$', '', name).strip() + name = re.sub(r' \[\d+\]$', '', name).strip() name_ = name n = 1 while name in used_names or \ diff --git a/pandora/item/timelines.py b/pandora/item/timelines.py index 7e2e12f8..a39ceee6 100644 --- a/pandora/item/timelines.py +++ b/pandora/item/timelines.py @@ -27,7 +27,7 @@ def join_tiles(source_paths, durations, target_path): def get_file_info(file_name): for mode in modes: - if re.match('^timeline' + mode + '64p\d+\.jpg', file_name): + if re.match(r'^timeline' + mode + r'64p\d+\.jpg', file_name): return { 'file': file_name, 'mode': mode, @@ -227,8 +227,8 @@ def split_tiles(path, paths, durations): file_names = list(filter(is_timeline_file, os.listdir(path))) tiles = {} for file_name in file_names: - mode = re.split('\d+', file_name[8:])[0] - split = re.split('[a-z]+', file_name[8 + len(mode):-4]) + mode = re.split(r'\d+', file_name[8:])[0] + split = re.split(r'[a-z]+', file_name[8 + len(mode):-4]) height, index = map(lambda x: int(x) if len(x) else -1, split) if mode not in tiles: tiles[mode] = {} diff --git a/pandora/itemlist/models.py b/pandora/itemlist/models.py index a7a6f8f4..2c7a4901 100644 --- a/pandora/itemlist/models.py +++ b/pandora/itemlist/models.py @@ -181,7 +181,7 @@ class List(models.Model): self.status = value elif key == 'name': - data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() + data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip() if not data['name']: data['name'] = "Untitled" name = data['name'] diff --git a/pandora/oxdjango/fields.py b/pandora/oxdjango/fields.py index 6227ffdc..75ddd3d8 100644 --- a/pandora/oxdjango/fields.py +++ b/pandora/oxdjango/fields.py @@ -104,7 +104,7 @@ class TupleField(DictField): try: from south.modelsinspector import add_introspection_rules - add_introspection_rules([], ["^oxdjango\.fields\.DictField"]) - add_introspection_rules([], ["^oxdjango\.fields\.TupleField"]) + add_introspection_rules([], [r"^oxdjango\.fields\.DictField"]) + add_introspection_rules([], [r"^oxdjango\.fields\.TupleField"]) except: pass diff --git a/pandora/text/models.py b/pandora/text/models.py index 2973ba6d..0489db31 100644 --- a/pandora/text/models.py +++ b/pandora/text/models.py @@ -131,7 +131,7 @@ class Text(models.Model): self.status = value elif key == 'name': - data['name'] = re.sub(' \[\d+\]$', '', data['name']).strip() + data['name'] = re.sub(r' \[\d+\]$', '', data['name']).strip() if not data['name']: data['name'] = "Untitled" name = data['name'] @@ -215,7 +215,7 @@ class Text(models.Model): response['embeds'] = self.embeds response['names'] = [] else: - response['names'] = re.compile('<[^<>]*?data-name="(.+?)"').findall(self.text) + response['names'] = re.compile(r'<[^<>]*?data-name="(.+?)"').findall(self.text) for key in list(response): if key not in keys + default_keys: