use generators and comprehensions instead of lists

packages/python/chart-studio/chart_studio/api/v2/utils.py

@@ -75,7 +75,7 @@ def validate_response(response):
     if isinstance(parsed_content, dict):
         errors = parsed_content.get("errors", [])
         messages = [error.get("message") for error in errors]
-        message = "\n".join([msg for msg in messages if msg])
+        message = "\n".join(msg for msg in messages if msg)
     if not message:
         message = content if content else "No Content"
 

packages/python/chart-studio/chart_studio/dashboard_objs/dashboard_objs.py

@@ -296,9 +296,7 @@ def _make_all_nodes_and_paths(self):
         all_nodes.sort(key=lambda x: x[1])
 
         # remove path 'second' as it's always an empty box
-        all_paths = []
-        for node in all_nodes:
-            all_paths.append(node[1])
+        all_paths = [node[1] for node in all_nodes]
         path_second = ("second",)
         if path_second in all_paths:
             all_paths.remove(path_second)

packages/python/chart-studio/chart_studio/grid_objs/grid_objs.py

@@ -164,9 +164,10 @@ def __init__(self, columns_or_json, fid=None):
                 raise exceptions.InputError(err)
 
             # create columns from dataframe
-            all_columns = []
-            for name in columns_or_json.columns:
-                all_columns.append(Column(columns_or_json[name].tolist(), name))
+            all_columns = [
+                Column(columns_or_json[name].tolist(), name)
+                for name in columns_or_json.columns
+            ]
             self._columns = all_columns
             self.id = ""
 
@@ -199,21 +200,17 @@ def __init__(self, columns_or_json, fid=None):
                         )
             # collect and sort all orders in case orders do not start
             # at zero or there are jump discontinuities between them
-            all_orders = []
-            for column_name in columns_or_json["cols"].keys():
-                all_orders.append(columns_or_json["cols"][column_name]["order"])
+            all_orders = [value["order"] for value in columns_or_json["cols"].values()]
             all_orders.sort()
 
             # put columns in order in a list
             ordered_columns = []
             for order in all_orders:
-                for column_name in columns_or_json["cols"].keys():
-                    if columns_or_json["cols"][column_name]["order"] == order:
+                for value in columns_or_json["cols"].values():
+                    if value["order"] == order:
                         break
 
-                ordered_columns.append(
-                    Column(columns_or_json["cols"][column_name]["data"], column_name)
-                )
+                ordered_columns.append(Column(value["data"], column_name))
             self._columns = ordered_columns
 
             # fill in column_ids
@@ -290,9 +287,7 @@ def get_column_reference(self, column_name):
                 break
 
         if column_id is None:
-            col_names = []
-            for column in self._columns:
-                col_names.append(column.name)
+            col_names = [column.name for column in self._columns]
             raise _plotly_utils.exceptions.PlotlyError(
                 "Whoops, that column name doesn't match any of the column "
                 "names in your grid. You must pick from {cols}".format(cols=col_names)

packages/python/chart-studio/chart_studio/plotly/plotly.py

@@ -1236,7 +1236,7 @@ def append_rows(cls, rows, grid=None, grid_url=None):
         v2.grids.row(fid, {"rows": rows})
 
         if grid:
-            longest_column_length = max([len(col.data) for col in grid])
+            longest_column_length = max(len(col.data) for col in grid)
 
             for column in grid:
                 n_empty_rows = longest_column_length - len(column.data)
@@ -1659,15 +1659,12 @@ def upload(cls, dashboard, filename, sharing="public", auto_open=True):
 
     @classmethod
     def _get_all_dashboards(cls):
-        dashboards = []
         res = v2.dashboards.list().json()
-
-        for dashboard in res["results"]:
-            if not dashboard["deleted"]:
-                dashboards.append(dashboard)
+        dashboards = [
+            dashboard for dashboard in res["results"] if not dashboard["deleted"]
+        ]
         while res["next"]:
             res = v2.utils.request("get", res["next"]).json()
-
             for dashboard in res["results"]:
                 if not dashboard["deleted"]:
                     dashboards.append(dashboard)

packages/python/chart-studio/chart_studio/presentation_objs/presentation_objs.py

@@ -352,10 +352,11 @@ def _list_of_slides(markdown_string):
 
     text_blocks = re.split("\n-{2,}\n", markdown_string)
 
-    list_of_slides = []
-    for text in text_blocks:
-        if not all(char in ["\n", "-", " "] for char in text):
-            list_of_slides.append(text)
+    list_of_slides = [
+        text
+        for text in text_blocks
+        if not all(char in ["\n", "-", " "] for char in text)
+    ]
 
     if "\n-\n" in markdown_string:
         msg = (
@@ -972,19 +973,15 @@ def _markdown_to_presentation(self, markdown_string, style, imgStretch):
             if slide.count("```") % 2 != 0:
                 raise _plotly_utils.exceptions.PlotlyError(CODE_ENV_ERROR)
 
-            # find code blocks
-            code_indices = []
-            code_blocks = []
             wdw_size = len("```")
-            for j in range(len(slide)):
-                if slide[j : j + wdw_size] == "```":
-                    code_indices.append(j)
-
-            for k in range(int(len(code_indices) / 2)):
-                code_blocks.append(
-                    slide[code_indices[2 * k] : code_indices[(2 * k) + 1]]
-                )
-
+            # find code blocks
+            code_indices = [
+                j for j in range(len(slide)) if slide[j : j + wdw_size] == "```"
+            ]
+            code_blocks = [
+                slide[code_indices[2 * k] : code_indices[(2 * k) + 1]]
+                for k in range(int(len(code_indices) / 2))
+            ]
             lang_and_code_tuples = []
             for code_block in code_blocks:
                 # validate code blocks
@@ -1040,10 +1037,9 @@ def _markdown_to_presentation(self, markdown_string, style, imgStretch):
                             slide_trans = _remove_extra_whitespace_from_line(
                                 slide_trans
                             )
-                            slide_transition_list = []
-                            for key in VALID_TRANSITIONS:
-                                if key in slide_trans:
-                                    slide_transition_list.append(key)
+                            slide_transition_list = [
+                                key for key in VALID_TRANSITIONS if key in slide_trans
+                            ]
 
                             if slide_transition_list == []:
                                 slide_transition_list.append("slide")

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_image/test_image.py

@@ -77,7 +77,7 @@ def _test(self):
     ]:
 
         _test = test_generator(*args)
-        arg_string = ", ".join([str(a) for a in args])
+        arg_string = ", ".join(str(a) for a in args)
         test_name = test_generator.__name__.replace("_generate", "test")
         test_name += "({})".format(arg_string)
         setattr(TestImage, test_name, _test)

packages/python/chart-studio/chart_studio/utils.py

@@ -161,10 +161,11 @@ def validate_world_readable_and_sharing_settings(option_set):
 
 
 def validate_plotly_domains(option_set):
-    domains_not_none = []
-    for d in ["plotly_domain", "plotly_api_domain"]:
-        if d in option_set and option_set[d]:
-            domains_not_none.append(option_set[d])
+    domains_not_none = (
+        option_set[d]
+        for d in ["plotly_domain", "plotly_api_domain"]
+        if d in option_set and option_set[d]
+    )
 
     if not all(d.lower().startswith("https") for d in domains_not_none):
         warnings.warn(http_msg, category=UserWarning)

packages/python/plotly/_plotly_utils/basevalidators.py

@@ -1629,7 +1629,7 @@ def present(self, v):
         elif isinstance(v, string_types):
             return v
         else:
-            return tuple([tuple(e) for e in v])
+            return tuple(tuple(e) for e in v)
 
 
 class AngleValidator(BaseValidator):
@@ -1821,10 +1821,10 @@ def vc_scalar(self, v):
         split_vals = [e.strip() for e in re.split("[,+]", v)]
 
         # Are all flags valid names?
-        all_flags_valid = all([f in self.all_flags for f in split_vals])
+        all_flags_valid = all(f in self.all_flags for f in split_vals)
 
         # Are any 'extras' flags present?
-        has_extras = any([f in self.extras for f in split_vals])
+        has_extras = any(f in self.extras for f in split_vals)
 
         # For flaglist to be valid all flags must be valid, and if we have
         # any extras present, there must be only one flag (the single extras
@@ -2705,7 +2705,7 @@ def validate_coerce(self, v, skip_invalid=False):
             # multiple template names joined on '+' characters
             elif isinstance(v, string_types):
                 template_names = v.split("+")
-                if all([name in pio.templates for name in template_names]):
+                if all(name in pio.templates for name in template_names):
                     return pio.templates.merge_templates(*template_names)
 
         except TypeError:

packages/python/plotly/_plotly_utils/colors/__init__.py

@@ -766,20 +766,14 @@ def colorscale_to_colors(colorscale):
     """
     Extracts the colors from colorscale as a list
     """
-    color_list = []
-    for item in colorscale:
-        color_list.append(item[1])
-    return color_list
+    return [item[1] for item in colorscale]
 
 
 def colorscale_to_scale(colorscale):
     """
     Extracts the interpolation scale values from colorscale as a list
     """
-    scale_list = []
-    for item in colorscale:
-        scale_list.append(item[0])
-    return scale_list
+    return [item[0] for item in colorscale]
 
 
 def convert_colorscale_to_rgb(colorscale):

packages/python/plotly/codegen/figure.py

@@ -67,7 +67,7 @@ def build_figure_py(
     buffer.write(f"from plotly.{base_package} import {base_classname}\n")
 
     # ### Import trace graph_obj classes ###
-    trace_types_csv = ", ".join([n.name_datatype_class for n in trace_nodes])
+    trace_types_csv = ", ".join(n.name_datatype_class for n in trace_nodes)
     buffer.write(f"from plotly.graph_objs import ({trace_types_csv})\n")
 
     # Write class definition

packages/python/plotly/plotly/_version.py

@@ -186,11 +186,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         if verbose:
             print ("keywords are unexpanded, not using")
         raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
+    refs = set(r.strip() for r in refnames.strip("()").split(","))
     # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
     # just "foo-1.0". If we see a "tag: " prefix, prefer those.
     TAG = "tag: "
-    tags = set([r[len(TAG) :] for r in refs if r.startswith(TAG)])
+    tags = set(r[len(TAG) :] for r in refs if r.startswith(TAG))
     if not tags:
         # Either we're using git < 1.8.3, or there really are no tags. We use
         # a heuristic: assume all version tags have a digit. The old git %d
@@ -199,7 +199,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         # between branches and tags. By ignoring refnames without digits, we
         # filter out many common branch names like "release" and
         # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r"\d", r)])
+        tags = set(r for r in refs if re.search(r"\d", r))
         if verbose:
             print ("discarding '%s', no digits" % ",".join(refs - tags))
     if verbose:

packages/python/plotly/plotly/basedatatypes.py

@@ -632,15 +632,13 @@ def data(self, new_data):
         # -----------
 
         # ### Compute new index for each remaining trace ###
-        new_inds = []
-        for uid in uids_post_removal:
-            new_inds.append(new_uids.index(uid))
+        new_inds = [new_uids.index(uid) for uid in uids_post_removal]
 
         # ### Compute current index for each remaining trace ###
         current_inds = list(range(len(traces_props_post_removal)))
 
         # ### Check whether a move is needed ###
-        if not all([i1 == i2 for i1, i2 in zip(new_inds, current_inds)]):
+        if not all(i1 == i2 for i1, i2 in zip(new_inds, current_inds)):
 
             # #### Save off index lists for moveTraces message ####
             msg_current_inds = current_inds
@@ -2367,15 +2365,13 @@ def _build_update_params_from_batch(self):
         # Handle Style / Trace Indexes
         # ----------------------------
         batch_style_commands = self._batch_trace_edits
-        trace_indexes = sorted(set([trace_ind for trace_ind in batch_style_commands]))
+        trace_indexes = sorted(set(trace_ind for trace_ind in batch_style_commands))
 
         all_props = sorted(
             set(
-                [
-                    prop
-                    for trace_style in self._batch_trace_edits.values()
-                    for prop in trace_style
-                ]
+                prop
+                for trace_style in self._batch_trace_edits.values()
+                for prop in trace_style
             )
         )
 
@@ -3999,7 +3995,7 @@ def on_change(self, callback, *args, **kwargs):
 
         # Normalize args to path tuples
         # -----------------------------
-        arg_tuples = tuple([BaseFigure._str_to_dict_path(a) for a in args])
+        arg_tuples = tuple(BaseFigure._str_to_dict_path(a) for a in args)
 
         # Initialize callbacks list
         # -------------------------

packages/python/plotly/plotly/figure_factory/_annotated_heatmap.py

@@ -276,8 +276,8 @@ def get_z_mid(self):
             z_min = np.amin(self.z)
             z_max = np.amax(self.z)
         else:
-            z_min = min([v for row in self.z for v in row])
-            z_max = max([v for row in self.z for v in row])
+            z_min = min(v for row in self.z for v in row)
+            z_max = max(v for row in self.z for v in row)
         z_mid = (z_max + z_min) / 2
         return z_mid
 

packages/python/plotly/plotly/figure_factory/_county_choropleth.py

@@ -138,9 +138,7 @@ def _create_us_counties_df(st_to_state_name_dict, state_to_st_dict):
     gdf_reduced = gdf[["FIPS", "STATEFP", "COUNTY_NAME", "geometry"]]
     gdf_statefp = gdf_reduced.merge(df_state[["STATEFP", "STATE_NAME"]], on="STATEFP")
 
-    ST = []
-    for n in gdf_statefp["STATE_NAME"]:
-        ST.append(state_to_st_dict[n])
+    ST = [state_to_st_dict[n] for n in gdf_statefp["STATE_NAME"]]
 
     gdf_statefp["ST"] = ST
     return gdf_statefp, df_state