handle badly nested bullets

.github/workflows/test.yml

@@ -21,8 +21,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install -e 'git+https://git@github.com/laws-africa/cobalt.git@master#egg=cobalt'
+        pip install 'git+https://git@github.com/laws-africa/cobalt.git@master#egg=cobalt'
         pip install -e '.[test]'
     - name: Test with nosetests
       run: nosetests

bluebell/types.py

@@ -484,7 +484,11 @@ def to_dict(self):
             kids.append(empty_p())
 
         if self.content.text:
-            kids.extend(k.to_dict() for k in self.content.siblings)
+            for kid in self.content.siblings:
+                if hasattr(kid, 'to_dict'):
+                    kids.append(kid.to_dict())
+                else:
+                    kids.extend(kid.to_children())
 
         return {
             'type': 'element',

tests/test_bullet_list.py

@@ -406,4 +406,68 @@ def test_non_starred_items(self):
     <p eId="ul_1__li_5__p_1">no star 3</p>
   </li>
 </ul>
+""", xml)
+
+    def test_bad_bullets_with_hier(self):
+        tree = self.parse("""
+  BULLETS
+
+    PARA 24.
+
+      SUBPARA i.
+
+        Bar
+""", 'judgment')
+
+        self.assertEqual({
+            'attribs': {'name': 'judgment'},
+            'children': [
+                {'name': 'header', 'type': 'element'},
+                {'children': [{
+                    'children': [{
+                        'children': [{
+                            'children': [{
+                                'children': [{'type': 'text', 'value': 'PARA 24.'}],
+                                'name': 'p',
+                                'type': 'content'
+                            }, {
+                                'children': [{'type': 'text', 'value': 'SUBPARA i.'}],
+                                'name': 'p',
+                                'type': 'content'
+                            }, {
+                                'children': [{'type': 'text', 'value': 'Bar'}],
+                                'name': 'p',
+                                'type': 'content'
+                            }],
+                            'name': 'li',
+                            'type': 'element'
+                        }],
+                        'name': 'ul',
+                        'type': 'block'}
+                    ],
+                    'name': 'arguments',
+                    'type': 'element'}
+                ],
+                    'name': 'judgmentBody',
+                    'type': 'element'}],
+            'name': 'judgment',
+            'type': 'element'
+        }, tree.to_dict())
+
+        xml = self.tostring(self.to_xml(tree.to_dict()))
+
+        self.assertEqual("""<judgment xmlns="http://docs.oasis-open.org/legaldocml/ns/akn/3.0" name="judgment">
+  <header/>
+  <judgmentBody>
+    <arguments>
+      <ul eId="arguments__ul_1">
+        <li eId="arguments__ul_1__li_1">
+          <p eId="arguments__ul_1__li_1__p_1">PARA 24.</p>
+          <p eId="arguments__ul_1__li_1__p_2">SUBPARA i.</p>
+          <p eId="arguments__ul_1__li_1__p_3">Bar</p>
+        </li>
+      </ul>
+    </arguments>
+  </judgmentBody>
+</judgment>
 """, xml)