Merge pull request #2685 from alex/type-error

Use a TypeError, rather than a ValueError, when refusing to treat a str as a Vec
PyO3 · Nov 9, 2022 · 4b7e0ee · 4b7e0ee
2 parents 6746ff8 + f7a487b
commit 4b7e0ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/newsfragments/2685.changed.md b/newsfragments/2685.changed.md
@@ -0,0 +1 @@
+Use a TypeError, rather than a ValueError, when refusing to treat a str as a Vec
diff --git a/pytests/tests/test_sequence.py b/pytests/tests/test_sequence.py
@@ -17,7 +17,7 @@ def test_vec_from_bytes():
 
 
 def test_vec_from_str():
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         sequence.vec_to_vec_pystring("123")
 
 

diff --git a/src/types/sequence.rs b/src/types/sequence.rs
@@ -1,6 +1,6 @@
 // Copyright (c) 2017-present PyO3 Project and Contributors
 use crate::err::{self, PyDowncastError, PyErr, PyResult};
-use crate::exceptions::PyValueError;
+use crate::exceptions::PyTypeError;
 use crate::inspect::types::TypeInfo;
 use crate::internal_tricks::get_ssize_index;
 use crate::once_cell::GILOnceCell;
@@ -285,7 +285,7 @@ where
 {
     fn extract(obj: &'a PyAny) -> PyResult<Self> {
         if let Ok(true) = obj.is_instance_of::<PyString>() {
-            return Err(PyValueError::new_err("Can't extract `str` to `Vec`"));
+            return Err(PyTypeError::new_err("Can't extract `str` to `Vec`"));
         }
         extract_sequence(obj)
     }