Changed testing syntax.

r2/r2/controllers/api.py

@@ -236,7 +236,7 @@ def POST_move(self, res, thing, destination, reason, ip):
         g.permacache.delete(comments_key(currlink._id))
         g.permacache.delete(comments_key(destination._id))
 
-        body = "A comment was moved from here to [here]({0}).\n\n".format(thing.make_anchored_permalink(destination)) + (reason if reason else '')
+        body = "A comment was moved to [here]({0}).\n\n".format(thing.make_anchored_permalink(destination)) + (reason if reason else '')
 
         comment, inbox_rel = Comment._new(c.user,
                                           currlink, parent, body,

r2/r2/models/builder.py

@@ -455,14 +455,11 @@ def keep_item(self, item):
 class ToplevelCommentBuilder(UnbannedCommentBuilder):
     def keep_item(self, item):
         try:
-            item.parent_id
+            parent_id = item.parent_id
         except AttributeError:
             return True
-        else:
-            if item.parent_id:
-                return False
-            else:
-                return True
+
+        return parent_id is not None
 
 class ContextualCommentBuilder(CommentBuilderMixin, UnbannedCommentBuilder):
     def __init__(self, query, sr_ids, **kw):
@@ -577,7 +574,7 @@ def get_items(self, num, nested = True, starting_depth = 0):
             top = self.comment
             dont_collapse.append(top._id)
             #add parents for context
-            while self.context > 0 and hasattr(top, 'parent_id') and top.parent_id:
+            while self.context > 0 and hasattr(top, 'parent_id') and top.parent_id is not None:
                 self.context -= 1
                 new_top = comment_dict[top.parent_id]
                 comment_tree[new_top._id] = [top]
@@ -660,7 +657,7 @@ def sort_candidates():
             to_add = candidates.pop(0)
             direct_child = True
             #ignore top-level comments for now
-            if not hasattr(to_add, 'parent_id') or not to_add.parent_id:
+            if not hasattr(to_add, 'parent_id') or to_add.parent_id is not None:
                 p_id = None
             else:
                 #find the parent actually being displayed