Test fixes

Author: jonmmease

Diff for: packages/python/plotly/plotly/io/_templates.py

@@ -390,7 +390,7 @@ def to_templated(fig, skip=("title", "text")):
     >>> templated_fig = pio.to_templated(fig)
     >>> templated_fig.layout.template
     layout.Template({
-        'data': {}, 'layout': {'font': {'family': 'Courier', 'size': 20}}
+        'layout': {'font': {'family': 'Courier', 'size': 20}}
     })
     >>> templated_fig
     Figure({
@@ -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

Diff for: packages/python/plotly/plotly/tests/test_core/test_graph_objs/test_graph_objs.py

@@ -52,7 +52,7 @@ def test_old_class_names(self):
         # compat, so we basically just create a checkpoint with this test.
 
         for class_name in OLD_CLASS_NAMES:
-            self.assertIn(class_name, go.__dict__.keys())
+            self.assertIsNotNone(getattr(go, class_name, None))
 
     def test_title_as_string_layout(self):
         """

Diff for: packages/python/plotly/plotly/tests/test_core/test_graph_objs/test_instantiate_hierarchy.py

@@ -18,8 +18,9 @@ class HierarchyTest(TestCase):
     def test_construct_datatypes(self):
         for datatypes_module in datatype_modules:
             module = importlib.import_module(datatypes_module)
-            for name, obj in inspect.getmembers(module, inspect.isclass):
-                if name.startswith("_"):
+            for name in getattr(module, "__all__", []):
+                obj = getattr(module, name)
+                if name.startswith("_") or name[0].islower():
                     continue
                 try:
                     v = obj()
@@ -29,7 +30,8 @@ def test_construct_datatypes(self):
                             obj=obj, module=datatypes_module
                         )
                     )
-
+                    raise
+                print(module, name, obj)
                 if obj.__module__ == "plotly.graph_objs._deprecations":
                     self.assertTrue(isinstance(v, list) or isinstance(v, dict))
                     obj()

Diff for: 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",
             }