diff --git a/brutaldon/threadtree.py b/brutaldon/threadtree.py index e58ac4f..2ff3d4c 100644 --- a/brutaldon/threadtree.py +++ b/brutaldon/threadtree.py @@ -33,13 +33,8 @@ def maketree(descendants): yield lookup[rep], onelevel(subreps) else: yield lookup[rep], () - for root in sorted(roots): - seen.add(root) - reps = replies.get(root) - if reps: - yield lookup[root], onelevel(reps) - else: - yield lookup[root], () + return onelevel(roots) + # returns (status, gen[(status, gen[(status, ...), (status, ())]), ...]) # django can't do recursion well so we'll turn the tree diff --git a/brutaldon/views.py b/brutaldon/views.py index 1decaec..362d08c 100644 --- a/brutaldon/views.py +++ b/brutaldon/views.py @@ -693,9 +693,6 @@ def thread(request, id): # x for x in context.descendants if not toot_matches_filters(x, filters) # ] posts = tuple(threadtree.build(context.descendants)) - from pprint import pprint - pprint(posts) - raise SystemExit(0) return render( request, "main/thread.html",