diff --git a/crates/diff-tree/src/lib.rs b/crates/diff-tree/src/lib.rs index 6278cba4c..f7b91928a 100644 --- a/crates/diff-tree/src/lib.rs +++ b/crates/diff-tree/src/lib.rs @@ -31,7 +31,7 @@ const S_IFMT: u32 = 0o170000; const S_IFDIR: u32 = 0o040000; fn add_hash(get: &Bound, set: &Bound, string: &[u8], py: Python) -> PyResult<()> { - let str_obj = PyBytes::new_bound(py, string); + let str_obj = PyBytes::new(py, string); let hash_obj = str_obj.hash()?; let value = get.call1((hash_obj,))?; let n = string.len(); @@ -41,8 +41,8 @@ fn add_hash(get: &Bound, set: &Bound, string: &[u8], py: Python) - #[pyfunction] fn _count_blocks(py: Python, obj: &Bound) -> PyResult { - let default_dict_cls = PyModule::import_bound(py, "collections")?.getattr("defaultdict")?; - let int_cls = PyModule::import_bound(py, "builtins")?.getattr("int")?; + let default_dict_cls = PyModule::import(py, "collections")?.getattr("defaultdict")?; + let int_cls = PyModule::import(py, "builtins")?.getattr("int")?; let counts = default_dict_cls.call1((int_cls,))?; let get = counts.getattr("__getitem__")?; @@ -56,7 +56,7 @@ fn _count_blocks(py: Python, obj: &Bound) -> PyResult { } let num_chunks = chunks.extract::>()?.len(); - let pym = py.import_bound("dulwich.diff_tree")?; + let pym = py.import("dulwich.diff_tree")?; let block_size = pym.getattr("_BLOCK_SIZE")?.extract::()?; let mut block: Vec = Vec::with_capacity(block_size); @@ -79,7 +79,7 @@ fn _count_blocks(py: Python, obj: &Bound) -> PyResult { add_hash(&get, &set, &block, py)?; } - Ok(counts.to_object(py)) + Ok(counts.into_pyobject(py).unwrap().into()) } #[pyfunction] @@ -99,7 +99,7 @@ fn tree_entries(path: &[u8], tree: &Bound, py: Python) -> PyResult, py: Python) -> PyResult (entries1[i1].clone_ref(py), null_entry.clone_ref(py)), Ordering::Greater => (null_entry.clone_ref(py), entries2[i2].clone_ref(py)), }; - let pair = PyTuple::new_bound(py, &[e1, e2]); + let pair = PyTuple::new(py, &[e1, e2]).unwrap(); result.push(pair); match cmp { Ordering::Equal => { @@ -173,18 +173,20 @@ fn _merge_entries( } while i1 < entries1.len() { - let pair = PyTuple::new_bound(py, &[entries1[i1].clone_ref(py), null_entry.clone_ref(py)]); + let pair = + PyTuple::new(py, &[entries1[i1].clone_ref(py), null_entry.clone_ref(py)]).unwrap(); result.push(pair); i1 += 1; } while i2 < entries2.len() { - let pair = PyTuple::new_bound(py, &[null_entry.clone_ref(py), entries2[i2].clone_ref(py)]); + let pair = + PyTuple::new(py, &[null_entry.clone_ref(py), entries2[i2].clone_ref(py)]).unwrap(); result.push(pair); i2 += 1; } - Ok(PyList::new_bound(py, &result).to_object(py)) + Ok(PyList::new(py, &result).unwrap().to_object(py)) } #[pymodule] diff --git a/crates/objects/src/lib.rs b/crates/objects/src/lib.rs index 39ca3f3c8..1927292e7 100644 --- a/crates/objects/src/lib.rs +++ b/crates/objects/src/lib.rs @@ -45,7 +45,7 @@ fn sha_to_pyhex(py: Python, sha: &[u8]) -> PyResult { hexsha.push(bytehex(c & 0x0F)); } - Ok(PyBytes::new_bound(py, hexsha.as_slice()).into()) + Ok(PyBytes::new(py, hexsha.as_slice()).into()) } #[pyfunction] @@ -78,7 +78,7 @@ fn parse_tree( text = &text[namelen + 1..]; let sha = &text[..20]; entries.push(( - PyBytes::new_bound(py, name).to_object(py), + PyBytes::new(py, name).to_object(py), mode, sha_to_pyhex(py, sha)?, )); @@ -133,16 +133,16 @@ fn sorted_tree_items( } else { qsort_entries.sort_by(|a, b| cmp_with_suffix((a.1, a.0.as_slice()), (b.1, b.0.as_slice()))); } - let objectsm = py.import_bound("dulwich.objects")?; + let objectsm = py.import("dulwich.objects")?; let tree_entry_cls = objectsm.getattr("TreeEntry")?; qsort_entries .into_iter() .map(|(name, mode, hexsha)| -> PyResult { Ok(tree_entry_cls .call1(( - PyBytes::new_bound(py, name.as_slice()).to_object(py), + PyBytes::new(py, name.as_slice()).to_object(py), mode, - PyBytes::new_bound(py, hexsha.as_slice()).to_object(py), + PyBytes::new(py, hexsha.as_slice()).to_object(py), ))? .to_object(py)) }) diff --git a/crates/pack/src/lib.rs b/crates/pack/src/lib.rs index 159cd7405..47d942bbf 100644 --- a/crates/pack/src/lib.rs +++ b/crates/pack/src/lib.rs @@ -215,7 +215,7 @@ fn apply_delta(py: Python, py_src_buf: PyObject, py_delta: PyObject) -> PyResult return Err(ApplyDeltaError::new_err("dest size incorrect")); } - Ok(vec![PyBytes::new_bound(py, &out).into()]) + Ok(vec![PyBytes::new(py, &out).into()]) } #[pymodule]