blacken

Author: jonmmease

packages/python/plotly/_plotly_utils/importers.py

@@ -32,12 +32,10 @@ def __getattr__(import_name):
         # Check for submodule class
         if import_name in class_names:
             # print(parent_name, import_name)
-            rel_path_parts = class_names[import_name].split('.')
-            rel_module = '.'.join(rel_path_parts[:-1])
+            rel_path_parts = class_names[import_name].split(".")
+            rel_module = ".".join(rel_path_parts[:-1])
             class_name = import_name
-            class_module = importlib.import_module(
-                rel_module, parent_name
-            )
+            class_module = importlib.import_module(rel_module, parent_name)
             return getattr(class_module, class_name)
 
         raise AttributeError(

packages/python/plotly/codegen/__init__.py

@@ -18,7 +18,8 @@
     FrameNode,
     write_init_py,
     ElementDefaultsNode,
-    build_from_imports_py)
+    build_from_imports_py,
+)
 from codegen.validators import (
     write_validator_py,
     write_data_validator_py,
@@ -312,16 +313,18 @@ def __getattr__(import_name):
 
     # ### Output graph_objects.py alias
     graph_objects_rel_classes = [
-        "..graph_objs." + rel_path.split('.')[-1]
+        "..graph_objs." + rel_path.split(".")[-1]
         for rel_path in datatype_rel_class_imports[()]
     ]
     graph_objects_rel_modules = [
-        "..graph_objs." + rel_module.split('.')[-1]
+        "..graph_objs." + rel_module.split(".")[-1]
         for rel_module in datatype_rel_module_imports[()]
     ]
 
     graph_objects_init_source = build_from_imports_py(
-        graph_objects_rel_modules, graph_objects_rel_classes, init_extra=optional_figure_widget_import
+        graph_objects_rel_modules,
+        graph_objects_rel_classes,
+        init_extra=optional_figure_widget_import,
     )
     graph_objects_path = opath.join(outdir, "graph_objects", "__init__.py")
     os.makedirs(opath.join(outdir, "graph_objects"), exist_ok=True)

packages/python/plotly/codegen/datatypes.py

@@ -155,14 +155,18 @@ def _subplot_re_match(self, prop):
 
     child_datatype_nodes = node.child_datatypes
     subtype_nodes = child_datatype_nodes
-    valid_props_list = sorted([node.name_property for node in subtype_nodes + literal_nodes])
-    buffer.write(f"""
+    valid_props_list = sorted(
+        [node.name_property for node in subtype_nodes + literal_nodes]
+    )
+    buffer.write(
+        f"""
     # class properties
     # --------------------
     _parent_path_str = '{node.parent_path_str}'
     _path_str = '{node.path_str}'
     _valid_props = {{"{'", "'.join(valid_props_list)}"}}
-""")
+"""
+    )
 
     # ### Property definitions ###
     for subtype_node in subtype_nodes:
@@ -307,22 +311,27 @@ def __init__(self"""
         return_type=node.name_datatype_class,
     )
 
-    buffer.write(f"""
+    buffer.write(
+        f"""
         super({datatype_class}, self).__init__('{node.name_property}')
 
         if '_parent' in kwargs:
             self._parent = kwargs['_parent']
             return
-""")
+"""
+    )
 
     if datatype_class == "Layout":
-        buffer.write(f"""
+        buffer.write(
+            f"""
         # Override _valid_props for instance so that instance can mutate set
         # to support subplot properties (e.g. xaxis2)
         self._valid_props = {{"{'", "'.join(valid_props_list)}"}}
-""")
+"""
+        )
 
-    buffer.write(f"""
+    buffer.write(
+        f"""
         # Validate arg
         # ------------
         if arg is None:
@@ -340,7 +349,8 @@ def __init__(self"""
         # Handle skip_invalid
         # -------------------
         self._skip_invalid = kwargs.pop('skip_invalid', False)
-        """)
+        """
+    )
 
     buffer.write(
         f"""
@@ -351,7 +361,7 @@ def __init__(self"""
     for subtype_node in subtype_nodes:
         name_prop = subtype_node.name_property
         buffer.write(
-                f"""
+            f"""
         _v = arg.pop('{name_prop}', None)
         _v = {name_prop} if {name_prop} is not None else _v
         if _v is not None:

packages/python/plotly/codegen/utils.py

@@ -65,13 +65,13 @@ def build_from_imports_py(rel_modules=(), rel_classes=(), init_extra=""):
 
     import_lines = []
     for rel in rel_modules + rel_classes:
-        rel_parts = rel.split('.')
-        parent_module = '.'.join(rel_parts[:-1]) or '.'
+        rel_parts = rel.split(".")
+        parent_module = ".".join(rel_parts[:-1]) or "."
         import_target = rel_parts[-1]
         import_line = f"from {parent_module} import {import_target}"
         import_lines.append(import_line)
 
-    imports_str = '\n    '.join(import_lines)
+    imports_str = "\n    ".join(import_lines)
 
     result = f"""\
 import sys
@@ -89,6 +89,7 @@ def build_from_imports_py(rel_modules=(), rel_classes=(), init_extra=""):
 """
     return result
 
+
 # buffer = StringIO()
 #     for import_info in imports_info:
 #
@@ -442,10 +443,7 @@ def name_validator_class(self) -> str:
         -------
         str
         """
-        return (
-            self.name_property.title()
-            + "Validator"
-        )
+        return self.name_property.title() + "Validator"
 
     @property
     def name_base_validator(self) -> str:

packages/python/plotly/plotly/__init__.py

@@ -45,15 +45,15 @@
     from plotly.version import __version__
 
     __all__ = [
-        'graph_objs',
-        'tools',
-        'utils',
-        'offline',
-        'colors',
-        'io',
-        'data',
-        'colors',
-        '__version__'
+        "graph_objs",
+        "tools",
+        "utils",
+        "offline",
+        "colors",
+        "io",
+        "data",
+        "colors",
+        "__version__",
     ]
 else:
     __all__, __getattr__ = relative_import(
@@ -69,7 +69,7 @@
             ".data",
             ".colors",
         ],
-        ['.version.__version__']
+        [".version.__version__"],
     )
 
     # Trigger docstring generation
@@ -78,4 +78,5 @@
 
 # TODO: Set default template here to make sure import process is complete
 from plotly.io import templates
+
 templates._default = "plotly"

packages/python/plotly/plotly/basedatatypes.py

@@ -89,6 +89,7 @@ class is a subclass of both BaseFigure and widgets.DOMWidget.
             is invalid AND skip_invalid is False
         """
         from .validators import DataValidator, LayoutValidator, FramesValidator
+
         super(BaseFigure, self).__init__()
 
         # Assign layout_plotly to layout
@@ -247,6 +248,7 @@ class is a subclass of both BaseFigure and widgets.DOMWidget.
         # Animation property validators
         # -----------------------------
         from . import animation
+
         self._animation_duration_validator = animation.DurationValidator()
         self._animation_easing_validator = animation.EasingValidator()
 
@@ -1787,6 +1789,7 @@ def append_trace(self, trace, row, col):
 
     def _set_trace_grid_position(self, trace, row, col, secondary_y=False):
         from plotly.subplots import _set_trace_grid_reference
+
         grid_ref = self._validate_get_grid_ref()
         return _set_trace_grid_reference(
             trace, self.layout, grid_ref, row, col, secondary_y
@@ -1843,6 +1846,7 @@ def get_subplot(self, row, col, secondary_y=False):
                 - yaxis: plotly.graph_objs.layout.YAxis instance for subplot
         """
         from plotly.subplots import _get_grid_subplot
+
         return _get_grid_subplot(self, row, col, secondary_y)
 
     # Child property operations
@@ -1934,7 +1938,7 @@ def _init_child_props(self, child):
     def _initialize_layout_template(self):
         import plotly.io as pio
 
-        if self._layout_obj._props.get('template', None) is None:
+        if self._layout_obj._props.get("template", None) is None:
             if pio.templates.default is not None:
                 with validate(False):
                     # Assume default template is already validated
@@ -2842,7 +2846,10 @@ def _perform_update(plotly_obj, update_obj, overwrite=False):
             :class:`BasePlotlyType`, ``update_obj`` should be a tuple or list
             of dicts
         """
-        from _plotly_utils.basevalidators import CompoundValidator, CompoundArrayValidator
+        from _plotly_utils.basevalidators import (
+            CompoundValidator,
+            CompoundArrayValidator,
+        )
 
         if update_obj is None:
             # Nothing to do
@@ -2956,8 +2963,8 @@ class BasePlotlyType(object):
     # of relative path to new property (e.g. ('title', 'font')
     _mapped_properties = {}
 
-    _parent_path_str = ''
-    _path_str = ''
+    _parent_path_str = ""
+    _path_str = ""
     _valid_props = set()
 
     def __init__(self, plotly_name, **kwargs):
@@ -3014,6 +3021,7 @@ def __init__(self, plotly_name, **kwargs):
 
     def _get_validator(self, prop):
         from .validator_cache import ValidatorCache
+
         return ValidatorCache.get_validator(self._path_str, prop)
 
     def _process_kwargs(self, **kwargs):
@@ -3099,7 +3107,11 @@ def _get_child_props(self, child):
         else:
             # ### Child a compound property ###
             if child.plotly_name in self:
-                from _plotly_utils.basevalidators import CompoundValidator, CompoundArrayValidator
+                from _plotly_utils.basevalidators import (
+                    CompoundValidator,
+                    CompoundArrayValidator,
+                )
+
                 validator = self._get_validator(child.plotly_name)
 
                 if isinstance(validator, CompoundValidator):
@@ -3114,7 +3126,8 @@ def _get_child_props(self, child):
                     children_props = self._props.get(child.plotly_name, None)
                     return (
                         children_props[child_ind]
-                        if children_props is not None and len(children_props) > child_ind
+                        if children_props is not None
+                        and len(children_props) > child_ind
                         else None
                     )
 
@@ -3325,7 +3338,9 @@ def __getitem__(self, prop):
         Any
         """
         from _plotly_utils.basevalidators import (
-            CompoundValidator, CompoundArrayValidator, BaseDataValidator
+            CompoundValidator,
+            CompoundArrayValidator,
+            BaseDataValidator,
         )
 
         # Normalize prop
@@ -3348,7 +3363,6 @@ 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:
@@ -3364,10 +3378,13 @@ def __getitem__(self, prop):
             elif isinstance(validator, (CompoundArrayValidator, BaseDataValidator)):
                 if self._compound_array_props.get(prop, None) is None:
                     # Init list of compound objects
-                    self._compound_array_props[prop] = [
-                        validator.data_class(_parent=self)
-                        for _ in self._props.get(prop, [])
-                    ]
+                    if self._props is not None:
+                        self._compound_array_props[prop] = [
+                            validator.data_class(_parent=self)
+                            for _ in self._props.get(prop, [])
+                        ]
+                    else:
+                        self._compound_array_props[prop] = []
 
                 return validator.present(self._compound_array_props[prop])
             elif self._props is not None and prop in self._props:
@@ -3446,7 +3463,11 @@ def __setitem__(self, prop, value):
         -------
         None
         """
-        from _plotly_utils.basevalidators import CompoundValidator, CompoundArrayValidator, BaseDataValidator
+        from _plotly_utils.basevalidators import (
+            CompoundValidator,
+            CompoundArrayValidator,
+            BaseDataValidator,
+        )
 
         # Normalize prop
         # --------------
@@ -3504,7 +3525,6 @@ def __setitem__(self, prop, value):
                 self._compound_props.pop(prop, None)
                 self._compound_array_props.pop(prop, None)
 
-
         # Handle non-scalar case
         # ----------------------
         # e.g. ('foo', 1), ()
@@ -3592,6 +3612,7 @@ def _build_repr_for_class(props, class_name, parent_path_str=None):
             The representation string
         """
         from plotly.utils import ElidedPrettyPrinter
+
         if parent_path_str:
             class_name = parent_path_str + "." + class_name
 

packages/python/plotly/plotly/io/__init__.py

@@ -29,22 +29,19 @@
 else:
     __all__, __getattr__ = relative_import(
         __name__,
+        [".orca", ".base_renderers"],
         [
-            '.orca',
-            '.base_renderers'
+            "._orca.to_image",
+            "._orca.write_image",
+            "._json.to_json",
+            "._json.from_json",
+            "._json.read_json",
+            "._json.write_json",
+            "._templates.templates",
+            "._templates.to_templated",
+            "._html.to_html",
+            "._html.write_html",
+            "._renderers.renderers",
+            "._renderers.show",
         ],
-        [
-            '._orca.to_image',
-            '._orca.write_image',
-            '._json.to_json',
-            '._json.from_json',
-            '._json.read_json',
-            '._json.write_json',
-            '._templates.templates',
-            '._templates.to_templated',
-            '._html.to_html',
-            '._html.write_html',
-            '._renderers.renderers',
-            '._renderers.show',
-        ]
     )