From 32913dacb32c82ae325bf5d00e464c05cec2794a Mon Sep 17 00:00:00 2001 From: Foxboron Date: Tue, 15 Jan 2013 01:42:26 +0100 Subject: [PATCH] small cleanup --- tests/treesample.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/treesample.py b/tests/treesample.py index 1b1ed5d..cad69bc 100755 --- a/tests/treesample.py +++ b/tests/treesample.py @@ -40,7 +40,7 @@ class ExampleTreeWidget(urwid.TreeWidget): """ Display widget for leaf nodes """ def get_display_text(self): - return self.get_node().get_value()["name"] + return self.get_node().get_value()['name'] class ExampleNode(urwid.TreeNode): @@ -66,9 +66,6 @@ def load_child_node(self, key): childclass = ExampleParentNode else: childclass = ExampleNode - print(self) - print(key) - print(childdepth) return childclass(childdata, parent=self, key=key, depth=childdepth) @@ -125,21 +122,18 @@ def get_example_tree(): """ generate a quick 100 leaf tree for demo purposes """ f = open("comments.data", "r").read() info = json.loads(f)[0] - s = "%s %s\n%s" % (info["username"], info["time"], info["comment"]) - retval = {"name":s,"children":[]} - pprint(info) + s = "%s %s\n%s\n" % (info["username"], info["time"], info["comment"]) + retval = {"name":s, "children": []} for i in range(len(info["children"])): - l = get_example_tree_recursion(info["children"][i],i=i) + l = get_example_tree_recursion(info["children"][i]) retval["children"].append(l) return retval -def get_example_tree_recursion(info,i=None): - s = "%s %s\n%s" % (info["username"], info["time"], info["comment"]) - n = {"name": s} - if info.get("children"): - n["children"]=[] +def get_example_tree_recursion(info): + s = "%s %s\n%s\n" % (info["username"], info["time"], info["comment"]) + n = {"name": s, "children": []} for j in range(len(info["children"])): - l = get_example_tree_recursion(info["children"][j],i=j) + l = get_example_tree_recursion(info["children"][j]) n["children"].append(l) return n