FIX-#7576: Fix ambiguous AttributeError message (#7577)

Fixes an ambiguous error message raised on AttributeErrors due to calling a missing __getattr__ implementation.

Signed-off-by: Jonathan Shi <jonathan.shi@snowflake.com>

Author: sfc-gh-joshi

modin/pandas/dataframe.py

@@ -2647,12 +2647,9 @@ def __getattr__(self, key) -> Any:
         """
         # NOTE that to get an attribute, python calls __getattribute__() first and
         # then falls back to __getattr__() if the former raises an AttributeError.
-        try:
-            return super().__getattr__(key)
-        except AttributeError as err:
-            if key not in _ATTRS_NO_LOOKUP and key in self.columns:
-                return self[key]
-            raise err
+        if key not in _ATTRS_NO_LOOKUP and key in self.columns:
+            return self[key]
+        raise AttributeError(f"'DataFrame' object has no attribute '{key}'")
 
     def __setattr__(self, key, value) -> None:
         """

modin/pandas/series.py

@@ -390,12 +390,9 @@ def __getattr__(self, key: Hashable) -> Any:
         """
         # NOTE that to get an attribute, python calls __getattribute__() first and
         # then falls back to __getattr__() if the former raises an AttributeError.
-        try:
-            return super().__getattr__(key)
-        except AttributeError as err:
-            if key not in _ATTRS_NO_LOOKUP and key in self._query_compiler.index:
-                return self[key]
-            raise err
+        if key not in _ATTRS_NO_LOOKUP and key in self._query_compiler.index:
+            return self[key]
+        raise AttributeError(f"'Series' object has no attribute '{key}'")
 
     __float__ = _coerce_method(float)
     __int__ = _coerce_method(int)

modin/tests/pandas/extensions/test_dataframe_extensions.py

@@ -224,7 +224,10 @@ def test_search_for_missing_attribute_in_overridden_columns(self, Backend1):
 
         df = pd.DataFrame({column_name: ["a"]}).set_backend(Backend1)
 
-        with pytest.raises(AttributeError):
+        with pytest.raises(
+            AttributeError,
+            match="'DataFrame' object has no attribute 'non_existent_column'",
+        ):
             getattr(df, "non_existent_column")
         column_getter.assert_called_once_with(df)