Merge remote-tracking branch 'upstream/master' into lucaionescu-mcmali

Author: alimcmaster1

pandas/core/generic.py

@@ -461,7 +461,7 @@ def _get_index_resolvers(self) -> Dict[str, ABCSeries]:
         for axis_name in self._AXIS_ORDERS:
             d.update(self._get_axis_resolvers(axis_name))
 
-        return {clean_column_name(k): v for k, v in d.items() if k is not int}
+        return {clean_column_name(k): v for k, v in d.items() if not isinstance(k, int)}
 
     def _get_cleaned_column_resolvers(self) -> Dict[str, ABCSeries]:
         """
@@ -476,7 +476,9 @@ def _get_cleaned_column_resolvers(self) -> Dict[str, ABCSeries]:
         if isinstance(self, ABCSeries):
             return {clean_column_name(self.name): self}
 
-        return {clean_column_name(k): v for k, v in self.items() if k is not int}
+        return {
+            clean_column_name(k): v for k, v in self.items() if not isinstance(k, int)
+        }
 
     @property
     def _info_axis(self):

pandas/tests/frame/test_query_eval.py

@@ -1076,6 +1076,7 @@ def df(self):
                 "that's": [9, 1, 8],
                 "☺": [8, 7, 6],
                 "foo#bar": [2, 4, 5],
+                1: [5, 7, 9],
             }
         )
 

pandas/tests/plotting/test_frame.py

@@ -3271,6 +3271,34 @@ def test_plot_no_numeric_data(self):
         with pytest.raises(TypeError):
             df.plot()
 
+    def test_missing_markers_legend(self):
+        # 14958
+        df = pd.DataFrame(np.random.randn(8, 3), columns=["A", "B", "C"])
+        ax = df.plot(y=["A"], marker="x", linestyle="solid")
+        df.plot(y=["B"], marker="o", linestyle="dotted", ax=ax)
+        df.plot(y=["C"], marker="<", linestyle="dotted", ax=ax)
+
+        self._check_legend_labels(ax, labels=["A", "B", "C"])
+        self._check_legend_marker(ax, expected_markers=["x", "o", "<"])
+
+    def test_missing_markers_legend_using_style(self):
+        # 14563
+        df = pd.DataFrame(
+            {
+                "A": [1, 2, 3, 4, 5, 6],
+                "B": [2, 4, 1, 3, 2, 4],
+                "C": [3, 3, 2, 6, 4, 2],
+                "X": [1, 2, 3, 4, 5, 6],
+            }
+        )
+
+        fig, ax = self.plt.subplots()
+        for kind in "ABC":
+            df.plot("X", kind, label=kind, ax=ax, style=".")
+
+        self._check_legend_labels(ax, labels=["A", "B", "C"])
+        self._check_legend_marker(ax, expected_markers=[".", ".", "."])
+
 
 def _generate_4_axes_via_gridspec():
     import matplotlib.pyplot as plt