BUG: in error message raised when invalid axis parameter (#25553)

Author: simonjayhawkins

doc/source/whatsnew/v0.25.0.rst

@@ -196,7 +196,7 @@ Missing
 ^^^^^^^
 
 - Fixed misleading exception message in :meth:`Series.missing` if argument ``order`` is required, but omitted (:issue:`10633`, :issue:`24014`).
--
+- Fixed class type displayed in exception message in :meth:`DataFrame.dropna` if invalid ``axis`` parameter passed (:issue:`25555`)
 -
 
 MultiIndex

pandas/core/generic.py

@@ -358,7 +358,7 @@ def _get_axis_number(cls, axis):
             except KeyError:
                 pass
         raise ValueError('No axis named {0} for object type {1}'
-                         .format(axis, type(cls)))
+                         .format(axis, cls))
 
     @classmethod
     def _get_axis_name(cls, axis):
@@ -372,7 +372,7 @@ def _get_axis_name(cls, axis):
             except KeyError:
                 pass
         raise ValueError('No axis named {0} for object type {1}'
-                         .format(axis, type(cls)))
+                         .format(axis, cls))
 
     def _get_axis(self, axis):
         name = self._get_axis_name(axis)

pandas/tests/frame/test_analytics.py

@@ -1385,7 +1385,8 @@ def test_idxmin(self, float_frame, int_frame):
                                         skipna=skipna)
                     tm.assert_series_equal(result, expected)
 
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             frame.idxmin(axis=2)
 
@@ -1402,7 +1403,8 @@ def test_idxmax(self, float_frame, int_frame):
                                         skipna=skipna)
                     tm.assert_series_equal(result, expected)
 
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             frame.idxmax(axis=2)
 

pandas/tests/frame/test_api.py

@@ -366,7 +366,8 @@ def test_swapaxes(self):
         self._assert_frame_equal(df.T, df.swapaxes(0, 1))
         self._assert_frame_equal(df.T, df.swapaxes(1, 0))
         self._assert_frame_equal(df, df.swapaxes(0, 0))
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               r" <class 'pandas.core(.sparse)?.frame.(Sparse)?DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             df.swapaxes(2, 5)
 

pandas/tests/frame/test_axis_select_reindex.py

@@ -1067,7 +1067,8 @@ def test_reindex_axis(self):
         reindexed2 = self.intframe.reindex(index=rows)
         assert_frame_equal(reindexed1, reindexed2)
 
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             self.intframe.reindex_axis(rows, axis=2)
 

pandas/tests/frame/test_missing.py

@@ -140,7 +140,8 @@ def test_dropna(self):
         assert_frame_equal(dropped, expected)
 
         # bad input
-        msg = "No axis named 3 for object type <class 'type'>"
+        msg = ("No axis named 3 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             df.dropna(axis=3)
 

pandas/tests/frame/test_quantile.py

@@ -95,10 +95,12 @@ def test_quantile_axis_parameter(self):
         result = df.quantile(.5, axis="columns")
         assert_series_equal(result, expected)
 
-        msg = "No axis named -1 for object type <class 'type'>"
+        msg = ("No axis named -1 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             df.quantile(0.1, axis=-1)
-        msg = "No axis named column for object type <class 'type'>"
+        msg = ("No axis named column for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             df.quantile(0.1, axis="column")
 

pandas/tests/frame/test_sorting.py

@@ -55,7 +55,8 @@ def test_sort_values(self):
         sorted_df = frame.sort_values(by=['B', 'A'], ascending=[True, False])
         assert_frame_equal(sorted_df, expected)
 
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             frame.sort_values(by=['A', 'B'], axis=2, inplace=True)
 

pandas/tests/frame/test_timeseries.py

@@ -862,7 +862,8 @@ def test_frame_to_period(self):
         pts = df.to_period('M', axis=1)
         tm.assert_index_equal(pts.columns, exp.columns.asfreq('M'))
 
-        msg = "No axis named 2 for object type <class 'type'>"
+        msg = ("No axis named 2 for object type"
+               " <class 'pandas.core.frame.DataFrame'>")
         with pytest.raises(ValueError, match=msg):
             df.to_period(axis=2)
 

pandas/tests/series/test_analytics.py

@@ -771,6 +771,7 @@ def test_isin_empty(self, empty):
         result = s.isin(empty)
         tm.assert_series_equal(expected, result)
 
+    @pytest.mark.skipif(PY2, reason="pytest.raises match regex fails")
     def test_ptp(self):
         # GH21614
         N = 1000
@@ -796,7 +797,8 @@ def test_ptp(self):
         with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
             tm.assert_series_equal(s.ptp(level=0, skipna=False), expected)
 
-        msg = r"No axis named 1 for object type <(class|type) 'type'>"
+        msg = ("No axis named 1 for object type"
+               " <class 'pandas.core.series.Series'>")
         with pytest.raises(ValueError, match=msg):
             with tm.assert_produces_warning(FutureWarning,
                                             check_stacklevel=False):