scripts: Relaxed -C/--compare to match eagerly
I.e. zip_longest -> zip This is for better consistency with other scripts where we treat shortened names as equivalent to being padded with globs. Padding with globs is slightly more flexible, and is convenient when scripts append special fields that the user may not expect (x/y after defines in plot.py/plotmpl.py for example). The alternative behavior of rejecting longer-than-expected names isn't super useful.
This commit is contained in:
+1
-2
@@ -650,8 +650,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -519,8 +519,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -2324,8 +2324,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -909,8 +909,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -650,8 +650,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -1008,8 +1008,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -982,8 +982,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -650,8 +650,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -798,8 +798,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
compare_ = min(
|
compare_ = min(
|
||||||
(n for n in table.keys()
|
(n for n in table.keys()
|
||||||
if all(fnmatch.fnmatchcase(k, c)
|
if all(fnmatch.fnmatchcase(k, c)
|
||||||
for k, c in it.zip_longest(n.split(','), compare,
|
for k, c in zip(n.split(','), compare))),
|
||||||
fillvalue=''))),
|
|
||||||
default=compare)
|
default=compare)
|
||||||
compare_r = table.get(compare_)
|
compare_r = table.get(compare_)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user