Unify drawer node classes under a common parent.

org_rw/dom.py

@@ -1,32 +1,23 @@
-class PropertyDrawerNode:
+class DrawerNode:
     def __init__(self):
         self.children = []
 
     def append(self, child):
         self.children.append(child)
 
+
+class PropertyDrawerNode(DrawerNode):
+
     def __repr__(self):
         return "<Properties: {}>".format(len(self.children))
 
 
-class LogbookDrawerNode:
+class LogbookDrawerNode(DrawerNode):
-    def __init__(self):
-        self.children = []
-
-    def append(self, child):
-        self.children.append(child)
-
     def __repr__(self):
         return "<LogBook: {}>".format(len(self.children))
 
 
-class ResultsDrawerNode:
+class ResultsDrawerNode(DrawerNode):
-    def __init__(self):
-        self.children = []
-
-    def append(self, child):
-        self.children.append(child)
-
     def __repr__(self):
         return "<Results: {}>".format(len(self.children))
 
@@ -82,12 +73,16 @@ class ListItem:
 
 
 class BlockNode:
+    def __init__(self):
+        self.children = []
+
     def append(self, child):
-        raise NotImplementedError()
+        self.children.append(child)
 
 
 class CodeBlock(BlockNode):
     def __init__(self, header, subtype):
+        super().__init__()
         self.header = header
         self.lines = None
         self.subtype = subtype

org_rw/org_rw.py

@@ -378,7 +378,7 @@ class Headline:
             elif isinstance(line, Text):
                 if isinstance(current_node, dom.BlockNode):
                     current_node.append(dom.Text(line))
-                elif isinstance(current_node, dom.LogbookDrawerNode):
+                elif isinstance(current_node, dom.DrawerNode):
                     current_node.append(dom.Text(line))
                 else:
                     if isinstance(current_node, dom.TableNode):