match error message to python

Author: samuelcolvin

pydantic_core/_pydantic_core.pyi

@@ -8,8 +8,8 @@ class SchemaValidator:
     def __init__(self, schema: Schema) -> None: ...
     def validate_python(self, input: Any) -> Any: ...
     def isinstance_python(self, input: Any) -> bool: ...
-    def validate_json(self, input: Union[str, bytes]) -> Any: ...
-    def isinstance_json(self, input: Union[str, bytes]) -> bool: ...
+    def validate_json(self, input: Union[str, bytes, bytearray]) -> Any: ...
+    def isinstance_json(self, input: Union[str, bytes, bytearray]) -> bool: ...
     def validate_assignment(self, field: str, input: Any, data: Dict[str, Any]) -> Dict[str, Any]: ...
 
 class SchemaError(ValueError):

src/validators/mod.rs

@@ -167,11 +167,13 @@ fn parse_json(input: &PyAny) -> PyResult<serde_json::Result<JsonInput>> {
     if let Ok(py_bytes) = input.cast_as::<PyBytes>() {
         Ok(serde_json::from_slice(py_bytes.as_bytes()))
     } else if let Ok(py_str) = input.cast_as::<PyString>() {
-        Ok(serde_json::from_str(&py_str.to_string_lossy()))
+        let str = py_str.to_str()?;
+        Ok(serde_json::from_str(str))
     } else if let Ok(py_byte_array) = input.cast_as::<PyByteArray>() {
         Ok(serde_json::from_slice(unsafe { py_byte_array.as_bytes() }))
     } else {
-        Err(PyTypeError::new_err("JSON input must be str, bytes or bytearray"))
+        let input_type = input.get_type().name().unwrap_or("unknown");
+        py_error!(PyTypeError; "JSON input must be str, bytes or bytearray, not {}", input_type)
     }
 }
 

tests/test_json.py

@@ -20,7 +20,7 @@ def test_input_types(input_value):
 
 def test_input_type_invalid():
     v = SchemaValidator({'type': 'list', 'items_schema': {'type': 'int'}})
-    with pytest.raises(TypeError, match='^JSON input must be str, bytes or bytearray$'):
+    with pytest.raises(TypeError, match='^JSON input must be str, bytes or bytearray, not list$'):
         v.validate_json([])