From: "Zbigniew Kempczyński" <zbigniew.kempczynski@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 08/18] scripts/igt_doc.py: don't use ":=" operator
Date: Fri, 10 Mar 2023 09:23:16 +0100 [thread overview]
Message-ID: <20230310082326.12088-9-zbigniew.kempczynski@intel.com> (raw)
In-Reply-To: <20230310082326.12088-1-zbigniew.kempczynski@intel.com>
From: Mauro Carvalho Chehab <mchehab@kernel.org>
As this was introduced on python 3.8, remove its usage, in order
to make the script compatible with version 3.7.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
---
scripts/igt_doc.py | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/scripts/igt_doc.py b/scripts/igt_doc.py
index cd8dccecb4..1d1d7856f2 100755
--- a/scripts/igt_doc.py
+++ b/scripts/igt_doc.py
@@ -58,7 +58,8 @@ def plural(field):
"""
- if (match := re.match(r"(.*)\b(\S+)", field)):
+ match = re.match(r"(.*)\b(\S+)", field)
+ if match:
ret_str = match.group(1)
word = match.group(2)
@@ -702,7 +703,8 @@ class TestList:
sort_field = self.field_list[sort_field.lower()]
if filter_field_expr:
- if not (match := re.match(r"(.*)=~\s*(.*)", filter_field_expr)):
+ match = re.match(r"(.*)=~\s*(.*)", filter_field_expr)
+ if not match:
sys.exit(f"Filter field {filter_field_expr} is not at <field> =~ <regex> syntax")
field = match.group(1).strip().lower()
@@ -859,7 +861,8 @@ class TestList:
current_field = ''
# Check if it is a new TEST section
- if (match := re.match(r'^TEST:\s*(.*)', file_line)):
+ match = re.match(r'^TEST:\s*(.*)', file_line)
+ if match:
current_test = self.test_number
self.test_number += 1
@@ -878,7 +881,8 @@ class TestList:
continue
# Check if it is a new SUBTEST section
- if (match := re.match(r'^SUBTESTS?:\s*(.*)', file_line)):
+ match = re.match(r'^SUBTESTS?:\s*(.*)', file_line)
+ if match:
current_subtest = subtest_number
subtest_number += 1
@@ -915,7 +919,8 @@ class TestList:
continue
# It is a known section. Parse its contents
- if (match := re.match(field_re, file_line)):
+ match = re.match(field_re, file_line)
+ if match:
current_field = self.field_list[match.group(1).lower()]
match_val = match.group(2)
@@ -929,7 +934,8 @@ class TestList:
continue
# Use hashes for arguments to avoid duplication
- if (match := re.match(r'arg\[(\d+)\]:\s*(.*)', file_line)):
+ match = re.match(r'arg\[(\d+)\]:\s*(.*)', file_line)
+ if match:
current_field = ''
if arg_ref is None:
sys.exit(f"{fname}:{file_ln + 1}: arguments should be defined after one or more subtests, at the same comment")
@@ -946,7 +952,8 @@ class TestList:
continue
- if (match := re.match(r'\@(\S+):\s*(.*)', file_line)):
+ match = re.match(r'\@(\S+):\s*(.*)', file_line)
+ if match:
if cur_arg >= 0:
current_field = ''
if arg_ref is None:
@@ -962,7 +969,8 @@ class TestList:
continue
# We don't need a multi-lined version here
- if (match := re.match(r'arg\[(\d+)\]\.values:\s*(.*)', file_line)):
+ match = re.match(r'arg\[(\d+)\]\.values:\s*(.*)', file_line)
+ if match:
cur_arg = int(match.group(1)) - 1
if cur_arg not in self.doc[current_test]["arg"][arg_ref]:
@@ -978,7 +986,8 @@ class TestList:
# Handle multi-line field contents
if current_field:
- if (match := re.match(r'\s+(.*)', file_line)):
+ match = re.match(r'\s+(.*)', file_line)
+ if match:
if handle_section == 'test':
dic = self.doc[current_test]
else:
@@ -991,7 +1000,8 @@ class TestList:
# Handle multi-line argument contents
if cur_arg >= 0 and arg_ref is not None:
- if (match := re.match(r'\s+\*?\s*(.*)', file_line)):
+ match = re.match(r'\s+\*?\s*(.*)', file_line)
+ if match:
match_val = match.group(1)
match = re.match(r'^(\<.*)\>$',self.doc[current_test]["arg"][arg_ref][cur_arg][cur_arg_element])
--
2.34.1
next prev parent reply other threads:[~2023-03-10 8:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-10 8:23 [igt-dev] [PATCH i-g-t 00/18] Add igt_doc.py Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 01/18] scripts/igt_doc.py: beautify its code Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 02/18] scripts/igt_doc.py: add JSON file output Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 03/18] scripts/igt_doc.py: dynamically create fields array from a JSON file Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 04/18] scripts/igt_doc.py: add support to specify numeric values Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 05/18] scripts/igt_doc.py: improve --show-subtests logic Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 06/18] scripts/igt_doc.py: add error handler for subprocess Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 07/18] scripts/igt_doc.py: improve multi-line logic Zbigniew Kempczyński
2023-03-10 8:23 ` Zbigniew Kempczyński [this message]
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 09/18] scripts/igt_doc.py: make it compatible with Python 3.6 Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 10/18] scripts/igt_doc.py: sets the minimal version to run the script Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 11/18] scripts/igt_doc.py: use a different logic to get IGT prefix Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 12/18] testplan/meson.build: add targets to build Xe test documentation Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 13/18] xe/xe_test_config.json: cleanup the field struct Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 14/18] xe/xe_huc_copy: add GPU dependency to its documentation Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 15/18] xe/xe_*: add TEST/SUBTEST documentation Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 16/18] xe-fast-feedback.testlist: update debugfs tests Zbigniew Kempczyński
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 17/18] xe_mmap: skip VRAM tests if no VRAM is found Zbigniew Kempczyński
2023-03-10 10:52 ` Das, Nirmoy
2023-03-13 6:48 ` Zbigniew Kempczyński
2023-03-14 12:26 ` Das, Nirmoy
2023-03-10 8:23 ` [igt-dev] [PATCH i-g-t 18/18] meson: replace "igt@xe/" by "igt@" Zbigniew Kempczyński
2023-03-10 10:23 ` [igt-dev] ✓ Fi.CI.BAT: success for Add igt_doc.py Patchwork
2023-03-13 1:18 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230310082326.12088-9-zbigniew.kempczynski@intel.com \
--to=zbigniew.kempczynski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox