Addressed more comments on PR

Author: eicchen

pandas/plotting/_matplotlib/core.py

@@ -1933,12 +1933,8 @@ def _make_plot(self, fig: Figure) -> None:
         _stacked_subplots_offsets = []
 
         self.subplots: list[Any]
-        if self.subplots:
-            subplots_flag = 1
-        else:
-            subplots_flag = 0
 
-        if subplots_flag & self.stacked:
+        if bool(self.subplots) & self.stacked:
             for i, sub_plot in enumerate(self.subplots):
                 if len(sub_plot) <= 1:
                     continue

pandas/tests/plotting/test_misc.py

@@ -683,20 +683,25 @@ def test_bar_plt_xaxis_intervalrange(self):
         )
 
 
-@pytest.fixture(scope="class")
-def BSS_data():
+@pytest.fixture
+def df_bar_data():
     return np.random.default_rng(3).integers(0, 100, 5)
 
 
-@pytest.fixture(scope="class")
-def BSS_df(BSS_data) -> DataFrame:
-    BSS_df = DataFrame(
-        {"A": BSS_data, "B": BSS_data[::-1], "C": BSS_data[0], "D": BSS_data[-1]}
+@pytest.fixture
+def df_bar_df(df_bar_data) -> DataFrame:
+    df_bar_df = DataFrame(
+        {
+            "A": df_bar_data,
+            "B": df_bar_data[::-1],
+            "C": df_bar_data[0],
+            "D": df_bar_data[-1],
+        }
     )
-    return BSS_df
+    return df_bar_df
 
 
-def _BSS_xyheight_from_ax_helper(BSS_data, ax, subplot_division):
+def _df_bar_xyheight_from_ax_helper(df_bar_data, ax, subplot_division):
     subplot_data_df_list = []
 
     # get xy and height of squares representing data, separated by subplots
@@ -705,7 +710,7 @@ def _BSS_xyheight_from_ax_helper(BSS_data, ax, subplot_division):
             [
                 (x.get_x(), x.get_y(), x.get_height())
                 for x in ax[i].findobj(plt.Rectangle)
-                if x.get_height() in BSS_data
+                if x.get_height() in df_bar_data
             ]
         )
         subplot_data_df_list.append(
@@ -715,12 +720,14 @@ def _BSS_xyheight_from_ax_helper(BSS_data, ax, subplot_division):
     return subplot_data_df_list
 
 
-def _BSS_subplot_checker(BSS_data, BSS_df, subplot_data_df, subplot_columns):
+def _df_bar_subplot_checker(df_bar_data, df_bar_df, subplot_data_df, subplot_columns):
     subplot_sliced_by_source = [
-        subplot_data_df.iloc[len(BSS_data) * i : len(BSS_data) * (i + 1)].reset_index()
+        subplot_data_df.iloc[
+            len(df_bar_data) * i : len(df_bar_data) * (i + 1)
+        ].reset_index()
         for i in range(len(subplot_columns))
     ]
-    expected_total_height = BSS_df.loc[:, subplot_columns].sum(axis=1)
+    expected_total_height = df_bar_df.loc[:, subplot_columns].sum(axis=1)
 
     for i in range(len(subplot_columns)):
         sliced_df = subplot_sliced_by_source[i]
@@ -745,65 +752,67 @@ def _BSS_subplot_checker(BSS_data, BSS_df, subplot_data_df, subplot_columns):
             )
 
 
-class TestBarSubplotStacked:
-    # GH Issue 61018
-    @pytest.mark.parametrize("columns_used", [["A", "B"], ["C", "D"], ["D", "A"]])
-    def test_bar_1_subplot_1_double_stacked(self, BSS_data, BSS_df, columns_used):
-        BSS_df_trimmed = BSS_df[columns_used]
-        subplot_division = [columns_used]
-        ax = BSS_df_trimmed.plot(subplots=subplot_division, kind="bar", stacked=True)
-        subplot_data_df_list = _BSS_xyheight_from_ax_helper(
-            BSS_data, ax, subplot_division
+# GH Issue 61018
+@pytest.mark.parametrize("columns_used", [["A", "B"], ["C", "D"], ["D", "A"]])
+def test_bar_1_subplot_1_double_stacked(df_bar_data, df_bar_df, columns_used):
+    df_bar_df_trimmed = df_bar_df[columns_used]
+    subplot_division = [columns_used]
+    ax = df_bar_df_trimmed.plot(subplots=subplot_division, kind="bar", stacked=True)
+    subplot_data_df_list = _df_bar_xyheight_from_ax_helper(
+        df_bar_data, ax, subplot_division
+    )
+    for i in range(len(subplot_data_df_list)):
+        _df_bar_subplot_checker(
+            df_bar_data, df_bar_df_trimmed, subplot_data_df_list[i], subplot_division[i]
         )
-        for i in range(len(subplot_data_df_list)):
-            _BSS_subplot_checker(
-                BSS_data, BSS_df_trimmed, subplot_data_df_list[i], subplot_division[i]
-            )
 
-    @pytest.mark.parametrize(
-        "columns_used", [["A", "B", "C"], ["A", "C", "B"], ["D", "A", "C"]]
+
+@pytest.mark.parametrize(
+    "columns_used", [["A", "B", "C"], ["A", "C", "B"], ["D", "A", "C"]]
+)
+def test_bar_2_subplot_1_double_stacked(df_bar_data, df_bar_df, columns_used):
+    df_bar_df_trimmed = df_bar_df[columns_used]
+    subplot_division = [(columns_used[0], columns_used[1]), (columns_used[2],)]
+    ax = df_bar_df_trimmed.plot(subplots=subplot_division, kind="bar", stacked=True)
+    subplot_data_df_list = _df_bar_xyheight_from_ax_helper(
+        df_bar_data, ax, subplot_division
     )
-    def test_bar_2_subplot_1_double_stacked(self, BSS_data, BSS_df, columns_used):
-        BSS_df_trimmed = BSS_df[columns_used]
-        subplot_division = [(columns_used[0], columns_used[1]), (columns_used[2],)]
-        ax = BSS_df_trimmed.plot(subplots=subplot_division, kind="bar", stacked=True)
-        subplot_data_df_list = _BSS_xyheight_from_ax_helper(
-            BSS_data, ax, subplot_division
-        )
-        for i in range(len(subplot_data_df_list)):
-            _BSS_subplot_checker(
-                BSS_data, BSS_df_trimmed, subplot_data_df_list[i], subplot_division[i]
-            )
+    for i in range(len(subplot_data_df_list)):
+        _df_bar_subplot_checker(
+            df_bar_data, df_bar_df_trimmed, subplot_data_df_list[i], subplot_division[i]
+        )
 
-    @pytest.mark.parametrize(
-        "subplot_division",
-        [
-            [("A", "B"), ("C", "D")],
-            [("A", "D"), ("C", "B")],
-            [("B", "C"), ("D", "A")],
-            [("B", "D"), ("C", "A")],
-        ],
+
+@pytest.mark.parametrize(
+    "subplot_division",
+    [
+        [("A", "B"), ("C", "D")],
+        [("A", "D"), ("C", "B")],
+        [("B", "C"), ("D", "A")],
+        [("B", "D"), ("C", "A")],
+    ],
+)
+def test_bar_2_subplot_2_double_stacked(df_bar_data, df_bar_df, subplot_division):
+    ax = df_bar_df.plot(subplots=subplot_division, kind="bar", stacked=True)
+    subplot_data_df_list = _df_bar_xyheight_from_ax_helper(
+        df_bar_data, ax, subplot_division
     )
-    def test_bar_2_subplot_2_double_stacked(self, BSS_data, BSS_df, subplot_division):
-        ax = BSS_df.plot(subplots=subplot_division, kind="bar", stacked=True)
-        subplot_data_df_list = _BSS_xyheight_from_ax_helper(
-            BSS_data, ax, subplot_division
-        )
-        for i in range(len(subplot_data_df_list)):
-            _BSS_subplot_checker(
-                BSS_data, BSS_df, subplot_data_df_list[i], subplot_division[i]
-            )
+    for i in range(len(subplot_data_df_list)):
+        _df_bar_subplot_checker(
+            df_bar_data, df_bar_df, subplot_data_df_list[i], subplot_division[i]
+        )
 
-    @pytest.mark.parametrize(
-        "subplot_division",
-        [[("A", "B", "C")], [("A", "D", "B")], [("C", "A", "D")], [("D", "C", "A")]],
+
+@pytest.mark.parametrize(
+    "subplot_division",
+    [[("A", "B", "C")], [("A", "D", "B")], [("C", "A", "D")], [("D", "C", "A")]],
+)
+def test_bar_2_subplots_1_triple_stacked(df_bar_data, df_bar_df, subplot_division):
+    ax = df_bar_df.plot(subplots=subplot_division, kind="bar", stacked=True)
+    subplot_data_df_list = _df_bar_xyheight_from_ax_helper(
+        df_bar_data, ax, subplot_division
     )
-    def test_bar_2_subplots_1_triple_stacked(self, BSS_data, BSS_df, subplot_division):
-        ax = BSS_df.plot(subplots=subplot_division, kind="bar", stacked=True)
-        subplot_data_df_list = _BSS_xyheight_from_ax_helper(
-            BSS_data, ax, subplot_division
-        )
-        for i in range(len(subplot_data_df_list)):
-            _BSS_subplot_checker(
-                BSS_data, BSS_df, subplot_data_df_list[i], subplot_division[i]
-            )
+    for i in range(len(subplot_data_df_list)):
+        _df_bar_subplot_checker(
+            df_bar_data, df_bar_df, subplot_data_df_list[i], subplot_division[i]
+        )