From 88e6a29ee76faee3626649b64a82141ee335a10e Mon Sep 17 00:00:00 2001 From: Balazs Benics Date: Thu, 2 Oct 2025 15:24:23 +0200 Subject: [PATCH 1/2] [analyzer][NFC] Simplify Analysis/csv2json.py --- clang/test/Analysis/csv2json.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang/test/Analysis/csv2json.py b/clang/test/Analysis/csv2json.py index 3c20d689243e7..d7fb3491f82fa 100644 --- a/clang/test/Analysis/csv2json.py +++ b/clang/test/Analysis/csv2json.py @@ -44,7 +44,7 @@ def csv_to_json_dict(csv_filepath): """ try: with open(csv_filepath, "r", encoding="utf-8") as csvfile: - reader = csv.reader(csvfile) + reader = csv.reader(csvfile, skipinitialspace=True) # Read the header row (column names) try: @@ -58,19 +58,19 @@ def csv_to_json_dict(csv_filepath): json.dumps({}, indent=2) return - other_column_names = [name.strip() for name in header[1:]] + header_length = len(header) data_dict = {} for row in reader: - if len(row) != len(header): + if len(row) != header_length: raise csv.Error("Inconsistent CSV file") exit(1) key = row[0] value_map = {} - for i, col_name in enumerate(other_column_names): + for i, col_name in enumerate(header[1:]): # +1 to skip the first column value_map[col_name] = row[i + 1].strip() From 01b0d270efbe5a0d97aa732ac485f0ada0973523 Mon Sep 17 00:00:00 2001 From: Balazs Benics Date: Thu, 2 Oct 2025 15:39:43 +0200 Subject: [PATCH 2/2] Hoist `header[1:]` --- clang/test/Analysis/csv2json.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/test/Analysis/csv2json.py b/clang/test/Analysis/csv2json.py index d7fb3491f82fa..6e1aca9a51779 100644 --- a/clang/test/Analysis/csv2json.py +++ b/clang/test/Analysis/csv2json.py @@ -59,6 +59,7 @@ def csv_to_json_dict(csv_filepath): return header_length = len(header) + other_column_names = header[1:] data_dict = {} @@ -70,7 +71,7 @@ def csv_to_json_dict(csv_filepath): key = row[0] value_map = {} - for i, col_name in enumerate(header[1:]): + for i, col_name in enumerate(other_column_names): # +1 to skip the first column value_map[col_name] = row[i + 1].strip()