scripts: Fixed some issues with -k/--keep-open

- Fixed a NameError in watch.py caused by an outdated variable name
  (renamed paths -> keep_open_paths). Yay for dynamic typing.

- Fixed fieldnames is None issue when csv file is empty.
This commit is contained in:
Christopher Haster
2025-03-14 00:49:21 -05:00
parent 3a290c41ab
commit 0dbd1561ae
5 changed files with 5 additions and 5 deletions

View File

@@ -283,7 +283,7 @@ def collect(csv_paths, defines=[]):
with openio(path) as f: with openio(path) as f:
reader = csv.DictReader(f, restval='') reader = csv.DictReader(f, restval='')
fields.extend( fields.extend(
k for k in reader.fieldnames k for k in reader.fieldnames or []
if k not in fields) if k not in fields)
for r in reader: for r in reader:
# filter by matching defines # filter by matching defines

View File

@@ -207,7 +207,7 @@ def collect(csv_paths, defines=[]):
with openio(path) as f: with openio(path) as f:
reader = csv.DictReader(f, restval='') reader = csv.DictReader(f, restval='')
fields.extend( fields.extend(
k for k in reader.fieldnames k for k in reader.fieldnames or []
if k not in fields) if k not in fields)
for r in reader: for r in reader:
# filter by matching defines # filter by matching defines

View File

@@ -83,7 +83,7 @@ def collect(csv_paths, defines=[]):
with openio(path) as f: with openio(path) as f:
reader = csv.DictReader(f, restval='') reader = csv.DictReader(f, restval='')
fields.extend( fields.extend(
k for k in reader.fieldnames k for k in reader.fieldnames or []
if k not in fields) if k not in fields)
for r in reader: for r in reader:
# filter by matching defines # filter by matching defines

View File

@@ -100,7 +100,7 @@ def collect(csv_paths, defines=[]):
with openio(path) as f: with openio(path) as f:
reader = csv.DictReader(f, restval='') reader = csv.DictReader(f, restval='')
fields.extend( fields.extend(
k for k in reader.fieldnames k for k in reader.fieldnames or []
if k not in fields) if k not in fields)
for r in reader: for r in reader:
# filter by matching defines # filter by matching defines

View File

@@ -179,7 +179,7 @@ def main(command, *,
re.sub('^-.', '', p), re.sub('^-.', '', p),
re.sub('^--[^=]+=', '', p)}: re.sub('^--[^=]+=', '', p)}:
if p and os.path.exists(p): if p and os.path.exists(p):
paths.add(p) keep_open_paths.add(p)
returncode = 0 returncode = 0
try: try: