Merge pull request #230 from garethstockwell/dev

Figure, Table: fix to_json() crash if caption is None
sergiocorreia · Mar 20, 2024 · e580ea5 · e580ea5
2 parents 582353b + 915b310
commit e580ea5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/panflute/elements.py b/panflute/elements.py
@@ -1047,10 +1047,11 @@ def caption(self):
 
     @caption.setter
     def caption(self, value):
-        self._caption = check_type_or_value(value, Caption, None)
-        if self._caption is not None:
-            self._caption.parent = self
-            self._caption.location = 'caption'
+        if value is None:
+            value = Caption()
+        self._caption = check_type(value, Caption)
+        self._caption.parent = self
+        self._caption.location = 'caption'
 
     def _slots_to_json(self):
         return [self._ica_to_json(), self.caption.to_json(), self.content.to_json()]

diff --git a/panflute/table_elements.py b/panflute/table_elements.py
@@ -135,10 +135,11 @@ def caption(self):
 
     @caption.setter
     def caption(self, value):
-        self._caption = check_type_or_value(value, Caption, None)
-        if self._caption is not None:
-            self._caption.parent = self
-            self._caption.location = 'caption'
+        if value is None:
+            value = Caption()
+        self._caption = check_type(value, Caption)
+        self._caption.parent = self
+        self._caption.location = 'caption'
 
     def _slots_to_json(self):
         ica = self._ica_to_json()