Skip to content

nit: pyarrow: simplify class validation error creation #10154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tpt wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −12
Open

nit: pyarrow: simplify class validation error creation #10154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions arrow-pyarrow-integration-testing/tests/test_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,20 +724,20 @@ def test_reject_other_classes():
# Arbitrary type that is not a PyArrow type
not_pyarrow = ["hello"]

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Array, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Array, got list"):
rust.round_trip_array(not_pyarrow)

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Schema, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Schema, got list"):
rust.round_trip_schema(not_pyarrow)

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Field, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.Field, got list"):
rust.round_trip_field(not_pyarrow)

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.DataType, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.DataType, got list"):
rust.round_trip_type(not_pyarrow)

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.RecordBatch, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.RecordBatch, got list"):
rust.round_trip_record_batch(not_pyarrow)

with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.RecordBatchReader, got builtins.list"):
with pytest.raises(TypeError, match="Expected instance of pyarrow.lib.RecordBatchReader, got list"):
rust.round_trip_record_batch_reader(not_pyarrow)
9 changes: 3 additions & 6 deletions arrow-pyarrow/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,10 @@ impl<T: ToPyArrow> IntoPyArrow for T {

fn validate_class(expected: &Bound<PyType>, value: &Bound<PyAny>) -> PyResult<()> {
if !value.is_instance(expected)? {
let expected_module = expected.getattr("__module__")?;
let expected_name = expected.getattr("__name__")?;
let found_class = value.get_type();
let found_module = found_class.getattr("__module__")?;
let found_name = found_class.getattr("__name__")?;
return Err(PyTypeError::new_err(format!(
"Expected instance of {expected_module}.{expected_name}, got {found_module}.{found_name}",
"Expected instance of {}, got {}",
expected.fully_qualified_name()?,
value.get_type().fully_qualified_name()?
)));
}
Ok(())
Expand Down
Loading