Undo changes to python and schema dirs

Author: osolmaz

python/jsondoc/convert/html.py

@@ -25,8 +25,6 @@
     create_h3_block,
     create_image_block,
     create_numbered_list_item_block,
-    create_unordered_list_block,
-    create_ordered_list_block,
     create_page,
     create_paragraph_block,
     create_quote_block,
@@ -758,29 +756,15 @@ def convert_img(self, el, convert_as_inline):
             )
         )
 
-    def convert_ul(self, el, convert_as_inline):
+    def convert_list(self, el, convert_as_inline):
         """
-        This is applied to <ul> tags. Create an unordered_list container block.
-        Children will be processed and added to this container.
+        This is applied to <ul> and <ol> tags. We simply return None, because
+        there is no need for a container block for list items in JSON-DOC.
         """
-        if convert_as_inline:
-            return ConvertOutput(main_object=create_rich_text())
-
-        return ConvertOutput(
-            main_object=create_unordered_list_block(typeid=self.options.typeid)
-        )
-
-    def convert_ol(self, el, convert_as_inline):
-        """
-        This is applied to <ol> tags. Create an ordered_list container block.
-        Children will be processed and added to this container.
-        """
-        if convert_as_inline:
-            return ConvertOutput(main_object=create_rich_text())
+        return None
 
-        return ConvertOutput(
-            main_object=create_ordered_list_block(typeid=self.options.typeid)
-        )
+    convert_ul = convert_list
+    convert_ol = convert_list
 
     def convert_li(self, el, convert_as_inline):
         parent = el.parent

python/jsondoc/convert/utils.py

@@ -31,14 +31,6 @@
     NumberedListItem,
     NumberedListItemBlock,
 )
-from jsondoc.models.block.types.unordered_list import (
-    UnorderedList,
-    UnorderedListBlock,
-)
-from jsondoc.models.block.types.ordered_list import (
-    OrderedList,
-    OrderedListBlock,
-)
 from jsondoc.models.block.types.paragraph import Paragraph, ParagraphBlock
 from jsondoc.models.block.types.quote import Quote, QuoteBlock
 from jsondoc.models.block.types.rich_text.base import RichTextBase
@@ -213,46 +205,6 @@ def create_numbered_list_item_block(
     )
 
 
-def create_unordered_list_block(
-    children: List[BlockBase] | None = None,
-    id: str | None = None,
-    created_time=None,
-    typeid: bool = False,
-) -> UnorderedListBlock:
-    if id is None:
-        id = generate_block_id(typeid=typeid)
-    if created_time is None:
-        created_time = get_current_time()
-
-    return UnorderedListBlock(
-        id=id,
-        created_time=created_time,
-        unordered_list=UnorderedList(),
-        has_children=children is not None and len(children) > 0,
-        children=children or [],
-    )
-
-
-def create_ordered_list_block(
-    children: List[BlockBase] | None = None,
-    id: str | None = None,
-    created_time=None,
-    typeid: bool = False,
-) -> OrderedListBlock:
-    if id is None:
-        id = generate_block_id(typeid=typeid)
-    if created_time is None:
-        created_time = get_current_time()
-
-    return OrderedListBlock(
-        id=id,
-        created_time=created_time,
-        ordered_list=OrderedList(),
-        has_children=children is not None and len(children) > 0,
-        children=children or [],
-    )
-
-
 def create_code_block(
     code: str | None = None,
     language: str | None = None,

python/jsondoc/models/block/types/ordered_list/__init__.py

@@ -11,8 +11,6 @@
 from jsondoc.models.block.types.heading_3 import Heading3Block
 from jsondoc.models.block.types.image import ImageBlock
 from jsondoc.models.block.types.numbered_list_item import NumberedListItemBlock
-from jsondoc.models.block.types.unordered_list import UnorderedListBlock
-from jsondoc.models.block.types.ordered_list import OrderedListBlock
 from jsondoc.models.block.types.paragraph import ParagraphBlock
 from jsondoc.models.block.types.quote import QuoteBlock
 from jsondoc.models.block.types.table import TableBlock
@@ -35,8 +33,6 @@
     Heading3Block,
     ImageBlock,
     NumberedListItemBlock,
-    UnorderedListBlock,
-    OrderedListBlock,
     ParagraphBlock,
     QuoteBlock,
     TableBlock,
@@ -57,8 +53,6 @@
     Heading3Block: [],
     ImageBlock: [],
     NumberedListItemBlock: ALL_BLOCK_TYPES,
-    UnorderedListBlock: [BulletedListItemBlock],
-    OrderedListBlock: [NumberedListItemBlock],
     ParagraphBlock: ALL_BLOCK_TYPES,
     QuoteBlock: ALL_BLOCK_TYPES,
     TableBlock: [TableRowBlock],