scripts: Fixed typo hiding zero-sized results in table renderer
This should either have checked diff_result==None, or we should be mapping diff_result=None => diff_result_=None. To be safe I've done both. This was a nasty typo and I only noticed because ctx.py stopped printing "cycle detected" for our linked-lists (which are expected to be cyclic).
This commit is contained in:
+2
-2
@@ -752,7 +752,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -820,7 +820,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -613,7 +613,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -681,7 +681,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -1888,7 +1888,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -1956,7 +1956,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+3
-2
@@ -995,6 +995,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
def table_recurse(results_, diff_results_,
|
def table_recurse(results_, diff_results_,
|
||||||
depth_,
|
depth_,
|
||||||
prefixes=('', '', '', '')):
|
prefixes=('', '', '', '')):
|
||||||
|
|
||||||
# build the children table at each layer
|
# build the children table at each layer
|
||||||
table_ = {
|
table_ = {
|
||||||
','.join(str(getattr(r, k)
|
','.join(str(getattr(r, k)
|
||||||
@@ -1010,7 +1011,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -1078,7 +1079,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -752,7 +752,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -820,7 +820,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -1114,7 +1114,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -1182,7 +1182,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -1084,7 +1084,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -1152,7 +1152,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -756,7 +756,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -824,7 +824,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
+2
-2
@@ -830,7 +830,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
for r in diff_results_ or []}
|
for r in diff_results_ or []}
|
||||||
names_ = [n
|
names_ = [n
|
||||||
for n in table_.keys() | diff_table_.keys()
|
for n in table_.keys() | diff_table_.keys()
|
||||||
if diff_results_ is None
|
if diff_results is None
|
||||||
or all_
|
or all_
|
||||||
or any(
|
or any(
|
||||||
types[k].ratio(
|
types[k].ratio(
|
||||||
@@ -898,7 +898,7 @@ def table(Result, results, diff_results=None, *,
|
|||||||
if name in table_ and depth_ > 1:
|
if name in table_ and depth_ > 1:
|
||||||
table_recurse(
|
table_recurse(
|
||||||
getattr(r, Result._children),
|
getattr(r, Result._children),
|
||||||
getattr(diff_r, Result._children, None) or [],
|
getattr(diff_r, Result._children, None),
|
||||||
depth_-1,
|
depth_-1,
|
||||||
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
(prefixes[2+(i==len(names_)-1)] + "|-> ",
|
||||||
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
prefixes[2+(i==len(names_)-1)] + "'-> ",
|
||||||
|
|||||||
Reference in New Issue
Block a user