CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

meta/lib/patchtest: python 3.12 regex

Browse Source 
Python 3 interprets string literals as Unicode strings, and therefore
\s is treated as an escaped Unicode character which is not correct.
Declaring the RegEx pattern as a raw string instead of unicode is
required for Python 3.

(From OE-Core rev: 329a555f7b8f00c648c44b01f423e6da33a46245)

Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Freihofer 2024-02-10 14:15:58 +01:00 committed by Richard Purdie
parent 7f2755daca
commit fe58da1393
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/lib/patchtest/tests/base.py
View File

@ -34,8 +34,8 @@ class PatchtestOEError(Exception):
class Base(unittest.TestCase):
# if unit test fails, fail message will throw at least the following JSON: {"id": <testid>}
endcommit_messages_regex = re.compile('\(From \w+-\w+ rev:|(?<!\S)Signed-off-by|(?<!\S)---\n')
patchmetadata_regex = re.compile('-{3} \S+|\+{3} \S+|@{2} -\d+,\d+ \+\d+,\d+ @{2} \S+')
endcommit_messages_regex = re.compile(r'\(From \w+-\w+ rev:|(?<!\S)Signed-off-by|(?<!\S)---\n')
patchmetadata_regex = re.compile(r'-{3} \S+|\+{3} \S+|@{2} -\d+,\d+ \+\d+,\d+ @{2} \S+')
@staticmethod

6
meta/lib/patchtest/utils.py
View File

@ -132,7 +132,7 @@ def get_subject_prefix(path):
if len(mbox):
subject = mbox[0]['subject']
if subject:
pattern = re.compile("(\[.*\])", re.DOTALL)
pattern = re.compile(r"(\[.*\])", re.DOTALL)
match = pattern.search(subject)
if match:
prefix = match.group(1)
@ -146,8 +146,8 @@ def valid_branch(branch):
invalid = lbranch.startswith('patch') or \
lbranch.startswith('rfc') or \
lbranch.startswith('resend') or \
re.search('^v\d+', lbranch) or \
re.search('^\d+/\d+', lbranch)
re.search(r'^v\d+', lbranch) or \
re.search(r'^\d+/\d+', lbranch)
return not invalid