sub _factory -> get_class_instance_by_name

Author: etpinard

plotly/graph_objs/graph_objs.py

@@ -453,7 +453,7 @@ def to_graph_objs(self, caller=True):
                   'key_type' in INFO[info_key]['keymeta'][key].keys()):
                 if INFO[info_key]['keymeta'][key]['key_type'] == 'object':
                     class_name = KEY_TO_NAME[key]
-                    obj = _factory(class_name)
+                    obj = get_class_instance_by_name(class_name)
                     if isinstance(obj, PlotlyDict):
                         if not isinstance(self[key], dict):
                             try:
@@ -794,7 +794,8 @@ def to_graph_objs(self, caller=True):  # TODO TODO TODO! check logic!
         """
         for index, entry in enumerate(self):
             if isinstance(entry, PlotlyDict):
-                self[index] = _factory(entry.__class__.__name__, entry)
+                self[index] = get_class_instance_by_name(
+                    entry.__class__.__name__, entry)
             elif isinstance(entry, dict):
                 if 'type' not in entry:  # assume 'scatter' if not given
                     entry['type'] = 'scatter'
@@ -805,7 +806,7 @@ def to_graph_objs(self, caller=True):  # TODO TODO TODO! check logic!
                         obj=self,
                         index=index
                     )
-                obj = _factory(obj_name)
+                obj = get_class_instance_by_name(obj_name)
                 for k, v in list(entry.items()):
                     obj[k] = v
                 self[index] = obj
@@ -845,7 +846,7 @@ def to_graph_objs(self, caller=True):
                               "different kind of graph object.",
                     )
             elif isinstance(entry, dict):
-                obj = _factory('Annotation')
+                obj = get_class_instance_by_name('Annotation')
                 for k, v in list(entry.items()):
                     obj[k] = v
                 self[index] = obj
@@ -908,9 +909,9 @@ def to_graph_objs(self, caller=True):
                     continue  # not an XAxis or YAxis object after all
                 if isinstance(self[key], dict):
                     if key[:5] == 'xaxis':
-                        obj = _factory('XAxis')
+                        obj = get_class_instance_by_name('XAxis')
                     else:
-                        obj = _factory('YAxis')
+                        obj = get_class_instance_by_name('YAxis')
                     for k, v in list(self.pop(key).items()):
                         obj[k] = v
                     self[key] = obj  # call to super will call 'to_graph_objs'
@@ -1063,7 +1064,7 @@ def force_clean(self, caller=True):  # TODO: can't make call to super...
                  for name in NAME_TO_KEY.keys()}
 
 
-def _factory(name, *args, **kwargs):
+def get_class_instance_by_name(name, *args, **kwargs):
     """All class creation goes through here.
 
     Because call signatures for the different classes are different, we have

plotly/tests/test_core/test_graph_objs/test_consistency.py

@@ -23,4 +23,4 @@ def test_names_in_name_to_key():
 def test_names_in_name_to_class():
     for key in graph_objs.INFO.keys():
         class_name = graph_objs.KEY_TO_NAME[key]
-        _class = graph_objs._factory(class_name)
+        _class = graph_objs.get_class_instance_by_name(class_name)

plotly/tools.py

@@ -454,10 +454,11 @@ def get_valid_graph_obj(obj, obj_type=None):
 
     """
     try:
-        new_obj = graph_objs._factory(obj.__class__.__name__)
+        new_obj = graph_objs.get_class_instance_by_name(
+            obj.__class__.__name__)
     except KeyError:
         try:
-            new_obj = graph_objs._factory(obj_type)
+            new_obj = graph_objs.get_class_instance_by_name(obj_type)
         except KeyError:
             raise exceptions.PlotlyError(
                 "'{0}' nor '{1}' are recognizable graph_objs.".
@@ -484,7 +485,7 @@ def validate(obj, obj_type):
     except KeyError:
         pass
     try:
-        test_obj = graph_objs._factory(obj_type, obj)
+        test_obj = graph_objs.get_class_instance_by_name(obj_type, obj)
     except KeyError:
         raise exceptions.PlotlyError(
             "'{0}' is not a recognizable graph_obj.".