updates for new jiter

Author: davidhewitt

Cargo.lock

@@ -26,7 +26,7 @@ include = [
 ]
 
 [dependencies]
-pyo3 = { version = "0.20.2", features = ["generate-import-lib", "num-bigint"] }
+pyo3 = { git = "https://github.com/davidhewitt/pyo3", branch="complete-py2", version = "0.21.0-dev", default-features=false, features = ["macros", "generate-import-lib", "num-bigint"] }
 regex = "1.10.2"
 strum = { version = "0.25.0", features = ["derive"] }
 strum_macros = "0.25.3"
@@ -43,7 +43,7 @@ base64 = "0.21.7"
 num-bigint = "0.4.4"
 python3-dll-a = "0.2.7"
 uuid = "1.6.1"
-jiter = {version = "0.0.6", features = ["python"]}
+jiter = { git = "https://github.com/pydantic/jiter", branch = "dh/py2", version = "0.0.6", features = ["python"]}
 
 [lib]
 name = "_pydantic_core"
@@ -70,12 +70,12 @@ debug = true
 strip = false
 
 [dev-dependencies]
-pyo3 = { version = "0.20.2", features = ["auto-initialize"] }
+pyo3 = { git = "https://github.com/davidhewitt/pyo3", branch="complete-py2", version = "0.21.0-dev", default-features=false, features = ["auto-initialize"] }
 
 [build-dependencies]
 version_check = "0.9.4"
 # used where logic has to be version/distribution specific, e.g. pypy
-pyo3-build-config = { version = "0.20.2" }
+pyo3-build-config = { git = "https://github.com/davidhewitt/pyo3", branch="complete-py2", version = "0.21.0-dev" }
 
 [lints.clippy]
 dbg_macro = "warn"
@@ -107,3 +107,10 @@ too_many_lines = "allow"
 unnecessary_wraps = "allow"
 unused_self = "allow"
 used_underscore_binding = "allow"
+
+[patch.'https://github.com/davidhewitt/pyo3']
+pyo3 = { path = "../pyo3" }
+pyo3-build-config = { path = "../pyo3/pyo3-build-config" }
+
+[patch.'https://github.com/pydantic/jiter']
+jiter = { path = "../jiter" }

Cargo.toml

@@ -39,7 +39,12 @@ pub use validators::{validate_core_schema, PySome, SchemaValidator};
 use crate::input::Input;
 
 #[pyfunction(signature = (data, *, allow_inf_nan=true, cache_strings=true))]
-pub fn from_json(py: Python, data: &PyAny, allow_inf_nan: bool, cache_strings: bool) -> PyResult<PyObject> {
+pub fn from_json<'py>(
+    py: Python<'py>,
+    data: &PyAny,
+    allow_inf_nan: bool,
+    cache_strings: bool,
+) -> PyResult<Py2<'py, PyAny>> {
     let v_match = data
         .validate_bytes(false)
         .map_err(|_| PyTypeError::new_err("Expected bytes, bytearray or str"))?;

src/lib.rs

@@ -66,7 +66,7 @@ impl Validator for JsonValidator {
             None => {
                 let obj =
                     jiter::python_parse(py, json_bytes, true, true).map_err(|e| map_json_err(input, e, json_bytes))?;
-                Ok(obj)
+                Ok(obj.into())
             }
         }
     }