Removed _unzip_pairs in favour of zip(*...)

Author: nicholas-esterer

packages/python/plotly/plotly/basedatatypes.py

@@ -21,11 +21,6 @@
 Undefined = object()
 
 
-def _unzip_pairs(pairs):
-    pairs = list(pairs)
-    return ([t[0] for t in pairs], [t[1] for t in pairs])
-
-
 def _combine_dicts(dicts):
     all_args = dict()
     for d in dicts:

packages/python/plotly/plotly/tests/test_core/test_autoshapes/test_axis_span_shapes.py

@@ -1,6 +1,6 @@
 import plotly.graph_objs as go
 from plotly.subplots import make_subplots
-from plotly.basedatatypes import _indexing_combinations, _unzip_pairs
+from plotly.basedatatypes import _indexing_combinations
 import plotly.express as px
 import pytest
 from common import _cmp_partial_dict, _check_figure_layout_objects

packages/python/plotly/plotly/tests/test_core/test_update_objects/test_select_subplots.py

@@ -1,7 +1,8 @@
 import plotly.graph_objs as go
 from plotly.subplots import make_subplots
-from plotly.basedatatypes import _indexing_combinations, _unzip_pairs
+from plotly.basedatatypes import _indexing_combinations
 import pytest
+from itertools import product
 
 NROWS = 4
 NCOLS = 5
@@ -154,29 +155,17 @@ def _sort_row_col_lists(rows, cols):
 @pytest.mark.parametrize(
     "test_input,expected",
     [
-        (
-            ("all", [2, 4, 5], False),
-            _unzip_pairs([(r, c) for r in range(1, NROWS + 1) for c in [2, 4, 5]]),
-        ),
-        (
-            ([1, 3], "all", False),
-            _unzip_pairs([(r, c) for r in [1, 3] for c in range(1, NCOLS + 1)]),
-        ),
-        (
-            ([1, 3], "all", True),
-            _unzip_pairs([(r, c) for r in [1, 3] for c in range(1, NCOLS + 1)]),
-        ),
-        (([1, 3], [2, 4, 5], False), _unzip_pairs([(1, 2), (3, 4)])),
-        (
-            ([1, 3], [2, 4, 5], True),
-            _unzip_pairs([(r, c) for r in [1, 3] for c in [2, 4, 5]]),
-        ),
+        (("all", [2, 4, 5], False), zip(*product(range(1, NROWS + 1), [2, 4, 5])),),
+        (([1, 3], "all", False), zip(*product([1, 3], range(1, NCOLS + 1))),),
+        (([1, 3], "all", True), zip(*product([1, 3], range(1, NCOLS + 1))),),
+        (([1, 3], [2, 4, 5], False), [(1, 3), (2, 4)]),
+        (([1, 3], [2, 4, 5], True), zip(*product([1, 3], [2, 4, 5])),),
     ],
 )
 def test_select_subplot_coordinates(subplot_fig_fixture, test_input, expected):
     rows, cols, product = test_input
     er, ec = _sort_row_col_lists(*expected)
     t = subplot_fig_fixture._select_subplot_coordinates(rows, cols, product=product)
-    r, c = _unzip_pairs(t)
+    r, c = zip(*t)
     r, c = _sort_row_col_lists(r, c)
     assert (r == er) and (c == ec)