From 5578e1db425fe08b224a94280c1147cbd7ecb9c0 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Mon, 3 Feb 2025 11:06:33 -0500 Subject: [PATCH 1/2] Standardize on obstore's NotFoundError --- pyo3-object_store/src/error.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyo3-object_store/src/error.rs b/pyo3-object_store/src/error.rs index 246dedb2..6a123cd8 100644 --- a/pyo3-object_store/src/error.rs +++ b/pyo3-object_store/src/error.rs @@ -1,7 +1,7 @@ //! Contains the [`PyObjectStoreError`], the error enum returned by all fallible functions in this //! crate. -use pyo3::exceptions::{PyFileNotFoundError, PyIOError, PyNotImplementedError, PyValueError}; +use pyo3::exceptions::{PyIOError, PyNotImplementedError, PyValueError}; use pyo3::prelude::*; use pyo3::{create_exception, DowncastError}; use thiserror::Error; @@ -111,7 +111,7 @@ impl From for PyErr { source: _, } => GenericError::new_err(format!("{err:#?}")), object_store::Error::NotFound { path: _, source: _ } => { - PyFileNotFoundError::new_err(format!("{err:#?}")) + NotFoundError::new_err(format!("{err:#?}")) } object_store::Error::InvalidPath { source: _ } => { InvalidPathError::new_err(format!("{err:#?}")) From fffaf714798598a9b4bea9bf5babb047e9ea1433 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Mon, 3 Feb 2025 11:56:26 -0500 Subject: [PATCH 2/2] fix tests --- tests/test_delete.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_delete.py b/tests/test_delete.py index d0ba0813..105c4f81 100644 --- a/tests/test_delete.py +++ b/tests/test_delete.py @@ -3,6 +3,7 @@ import pytest import obstore as obs +from obstore.exceptions import NotFoundError from obstore.store import LocalStore, MemoryStore @@ -50,7 +51,7 @@ def test_delete_one_local_fs(): obs.delete(store, "file3.txt") assert len(obs.list(store).collect()) == 0 - with pytest.raises(FileNotFoundError): + with pytest.raises(NotFoundError): obs.delete(store, "file1.txt") @@ -68,7 +69,7 @@ def test_delete_many_local_fs(): ["file1.txt", "file2.txt", "file3.txt"], ) - with pytest.raises(FileNotFoundError): + with pytest.raises(NotFoundError): obs.delete( store, ["file1.txt", "file2.txt", "file3.txt"],