Test fixes

Author: jonmmease

packages/python/plotly/plotly/basedatatypes.py

@@ -3348,6 +3348,7 @@ def __getitem__(self, prop):
                 raise KeyError(prop)
 
             validator = self._get_validator(prop)
+            self._init_props()
 
             if isinstance(validator, CompoundValidator):
                 if self._compound_props.get(prop, None) is None:

packages/python/plotly/plotly/io/_templates.py

@@ -304,7 +304,7 @@ def walk_push_to_template(fig_obj, template_obj, skip):
         fig_val = fig_obj[prop]
         template_val = template_obj[prop]
 
-        validator = fig_obj._validators[prop]
+        validator = fig_obj._get_validator(prop)
 
         if isinstance(validator, CompoundValidator):
             walk_push_to_template(fig_val, template_val, skip)
@@ -483,10 +483,17 @@ def to_templated(fig, skip=("title", "text")):
         trace_type_indexes[trace.type] = template_index + 1
 
     # Remove useless trace arrays
+    any_non_empty = False
     for trace_type in templated_fig.layout.template.data:
         traces = templated_fig.layout.template.data[trace_type]
         is_empty = [trace.to_plotly_json() == {"type": trace_type} for trace in traces]
         if all(is_empty):
             templated_fig.layout.template.data[trace_type] = None
+        else:
+            any_non_empty = True
+
+    # Check if we can remove the data altogether key
+    if not any_non_empty:
+        templated_fig.layout.template.data = None
 
     return templated_fig

packages/python/plotly/plotly/tests/test_core/test_graph_objs/test_template.py

@@ -195,7 +195,7 @@ def test_move_layout_nested_properties(self):
                     "layout": {
                         "font": {"family": "Courier New"},
                         "paper_bgcolor": "yellow",
-                    }
+                    },
                 },
                 "title": "Hello",
             }