From 2a18cd7f3d66ad105225947900bbc59c1770d93d Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Tue, 30 Apr 2024 16:05:21 +0200 Subject: [PATCH] [FIX] *: remove invalid escape sequences --- forwardport/models/project.py | 4 ++-- forwardport/tests/test_updates.py | 2 +- runbot/models/build.py | 2 +- runbot/tests/test_build_error.py | 2 +- runbot/tests/test_repo.py | 2 +- runbot_cla/build_config.py | 2 +- runbot_merge/models/project.py | 2 +- runbot_merge/tests/test_basic.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/forwardport/models/project.py b/forwardport/models/project.py index f59bdbbd..331b7c3f 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -58,7 +58,7 @@ class Project(models.Model): return super()._find_commands(comment) return re.findall( - '^\s*[@|#]?{}:? (.*)$'.format(self.fp_github_name), + r'^\s*[@|#]?{}:? (.*)$'.format(self.fp_github_name), comment, re.MULTILINE | re.IGNORECASE ) + super()._find_commands(comment) @@ -358,7 +358,7 @@ class PullRequests(models.Model): tokens = [ token - for line in re.findall('^\s*[@|#]?{}:? (.*)$'.format(self.repository.project_id.fp_github_name), comment['body'] or '', re.MULTILINE | re.IGNORECASE) + for line in re.findall(r'^\s*[@|#]?{}:? (.*)$'.format(self.repository.project_id.fp_github_name), comment['body'] or '', re.MULTILINE | re.IGNORECASE) for token in line.split() ] if not tokens: diff --git a/forwardport/tests/test_updates.py b/forwardport/tests/test_updates.py index 99471cd7..f8af94d8 100644 --- a/forwardport/tests/test_updates.py +++ b/forwardport/tests/test_updates.py @@ -403,7 +403,7 @@ conflict in this pull request, data may have been lost. stdout: ```.*? -CONFLICT \(add/add\): Merge conflict in h.*? +CONFLICT \\(add/add\\): Merge conflict in h.*? ``` stderr: diff --git a/runbot/models/build.py b/runbot/models/build.py index c059b57d..ba60f8f1 100644 --- a/runbot/models/build.py +++ b/runbot/models/build.py @@ -1244,4 +1244,4 @@ class BuildResult(models.Model): commit._github_status(build, trigger.ci_context, state, target_url, desc) def _parse_config(self): - return set(findall(self._server("tools/config.py"), '--[\w-]+', )) + return set(findall(self._server("tools/config.py"), r'--[\w-]+', )) diff --git a/runbot/tests/test_build_error.py b/runbot/tests/test_build_error.py index 2e750c13..9fac3123 100644 --- a/runbot/tests/test_build_error.py +++ b/runbot/tests/test_build_error.py @@ -52,7 +52,7 @@ class TestBuildError(RunbotCase): def test_create_write_clean(self): self.ErrorRegex.create({ - 'regex': '\d+', + 'regex': r'\d+', 're_type': 'cleaning', }) diff --git a/runbot/tests/test_repo.py b/runbot/tests/test_repo.py index f962d827..9965b44d 100644 --- a/runbot/tests/test_repo.py +++ b/runbot/tests/test_repo.py @@ -414,7 +414,7 @@ class TestIdentityFile(RunbotCase): def check_output_helper(self): """Helper that returns a mock for repo._git()""" def mock_check_output(cmd, *args, **kwargs): - expected_option = '-c core.sshCommand=ssh -i \/.+\/\.ssh\/fake_identity' + expected_option = r'-c core.sshCommand=ssh -i \/.+\/\.ssh\/fake_identity' git_cmd = ' '.join(cmd) self.assertTrue(re.search(expected_option, git_cmd), '%s did not match %s' % (git_cmd, expected_option)) return Mock() diff --git a/runbot_cla/build_config.py b/runbot_cla/build_config.py index d4c461eb..ab506ef5 100644 --- a/runbot_cla/build_config.py +++ b/runbot_cla/build_config.py @@ -30,7 +30,7 @@ class Step(models.Model): mo = re.search('[^ <@]+@[^ @>]+', email or '') if mo: email = mo.group(0).lower() - if not re.match('.*@(odoo|openerp|tinyerp)\.com$', email): + if not re.match(r'.*@(odoo|openerp|tinyerp)\.com$', email): try: cla = ''.join(io.open(f, encoding='utf-8').read() for f in cla_glob) if cla.lower().find(email) == -1: diff --git a/runbot_merge/models/project.py b/runbot_merge/models/project.py index fb46c33f..b484cdcf 100644 --- a/runbot_merge/models/project.py +++ b/runbot_merge/models/project.py @@ -74,7 +74,7 @@ class Project(models.Model): def _find_commands(self, comment): return re.findall( - '^\s*[@|#]?{}:? (.*)$'.format(self.github_prefix), + r'^\s*[@|#]?{}:? (.*)$'.format(self.github_prefix), comment, re.MULTILINE | re.IGNORECASE) def _has_branch(self, name): diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py index ea5dd098..84bdde29 100644 --- a/runbot_merge/tests/test_basic.py +++ b/runbot_merge/tests/test_basic.py @@ -624,7 +624,7 @@ def test_ff_failure(env, repo, config, page): _new, prev = doc.cssselect('li.staging') assert 'bg-gray-lighter' in prev.classes, "ff failure is ~ cancelling" - assert prev.get('title') == re_matches('fast forward failed \(update is not a fast forward\)') + assert prev.get('title') == re_matches(r'fast forward failed \(update is not a fast forward\)') assert env['runbot_merge.pull_requests'].search([ ('repository.name', '=', repo.name),