MagnitudeOS/littlefs
1
0
Fork 0
forked from Imagelibrary/littlefs
Code Pull Requests Activity

scripts: csv.py: Fixed NoneType issues with default sort

Browse Source 
$ ./scripts/csv.py lfs.code.csv -bfunction -fsize -S
  ... blablabla ...
  TypeError: cannot unpack non-iterable NoneType object

The issue was argparse's const defaults bypassing the type callback, so
the sort field ends up with None when it expects a tuple (well
technically a tuple tuple).

This is only an issue for csv.py because csv.py's sort fields can
contain exprs.
This commit is contained in:
Christopher Haster
2024-12-01 00:49:13 -06:00
parent 55d01f69f9
commit b4c79c53d2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/csv.py
View File

@@ -1264,7 +1264,7 @@ def infer(fields_, results,
# make sure sort fields are included # make sure sort fields are included
if sort is not None: if sort is not None:
by.extend(k for k, reverse in sort by.extend(k for k, reverse in sort
if k not in by and k not in fields) if k and k not in by and k not in fields)
# find best type for all fields used by field exprs # find best type for all fields used by field exprs
fields__ = set(it.chain.from_iterable( fields__ = set(it.chain.from_iterable(
@@ -1891,6 +1891,7 @@ if __name__ == "__main__":
k.strip(), k.strip(),
RExpr(v) if v is not None else None) RExpr(v) if v is not None else None)
)(*x.split('=', 1)), )(*x.split('=', 1)),
const=(None, None),
help="Sort by this field. Can include an expression of the form " help="Sort by this field. Can include an expression of the form "
"field=expr.") "field=expr.")
parser.add_argument( parser.add_argument(
@@ -1902,6 +1903,7 @@ if __name__ == "__main__":
k.strip(), k.strip(),
RExpr(v) if v is not None else None) RExpr(v) if v is not None else None)
)(*x.split('=', 1)), )(*x.split('=', 1)),
const=(None, None),
help="Sort by this field, but backwards. Can include an expression " help="Sort by this field, but backwards. Can include an expression "
"of the form field=expr.") "of the form field=expr.")
sys.exit(main(**{k: v sys.exit(main(**{k: v