From 92ac2a757e3a12b5ed7ea2d5d734a58893e985e9 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Mon, 10 Mar 2025 20:37:36 -0500 Subject: [PATCH] scripts: Adopted json -> is_json tweak, avoiding name conflict This was a humorous name conflict that went unnoticed only because we lazily import json in read_csv. --- scripts/code.py | 4 ++-- scripts/cov.py | 4 ++-- scripts/csv.py | 4 ++-- scripts/ctx.py | 4 ++-- scripts/data.py | 4 ++-- scripts/perf.py | 4 ++-- scripts/perfbd.py | 4 ++-- scripts/stack.py | 4 ++-- scripts/structs.py | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/code.py b/scripts/code.py index 3d430c50..6c405f23 100755 --- a/scripts/code.py +++ b/scripts/code.py @@ -892,10 +892,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/cov.py b/scripts/cov.py index 75b44d04..b6c0a140 100755 --- a/scripts/cov.py +++ b/scripts/cov.py @@ -747,10 +747,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/csv.py b/scripts/csv.py index ddf4d3b0..59746f5b 100755 --- a/scripts/csv.py +++ b/scripts/csv.py @@ -1350,10 +1350,10 @@ def collect_csv(csv_paths, *, try: with openio(path) as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: reader = csv.DictReader(f, restval='') # collect fields fields.update((k, True) for k in reader.fieldnames or []) diff --git a/scripts/ctx.py b/scripts/ctx.py index 1dbbea2f..34437770 100755 --- a/scripts/ctx.py +++ b/scripts/ctx.py @@ -1152,10 +1152,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/data.py b/scripts/data.py index bd91f0e3..bc6ed733 100755 --- a/scripts/data.py +++ b/scripts/data.py @@ -892,10 +892,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/perf.py b/scripts/perf.py index cbc8f54f..c83c7748 100755 --- a/scripts/perf.py +++ b/scripts/perf.py @@ -1253,10 +1253,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/perfbd.py b/scripts/perfbd.py index 4311876c..8b99d4a7 100755 --- a/scripts/perfbd.py +++ b/scripts/perfbd.py @@ -1227,10 +1227,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/stack.py b/scripts/stack.py index ac7c3d64..ef7843ae 100755 --- a/scripts/stack.py +++ b/scripts/stack.py @@ -895,10 +895,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: diff --git a/scripts/structs.py b/scripts/structs.py index 3eb6462c..a302ea91 100755 --- a/scripts/structs.py +++ b/scripts/structs.py @@ -1033,10 +1033,10 @@ def read_csv(path, Result, *, with openio(path, 'r') as f: # csv or json? assume json starts with [ - json = (f.buffer.peek(1)[:1] == b'[') + is_json = (f.buffer.peek(1)[:1] == b'[') # read csv? - if not json: + if not is_json: results = [] reader = csv.DictReader(f, restval='') for r in reader: