From 4777affc2bb57ea52e638f68d587514e30bb4a04 Mon Sep 17 00:00:00 2001 From: dece Date: Fri, 15 May 2020 19:21:37 +0200 Subject: [PATCH] Revert "python: faulty unpackers::bnd bindings" This reverts commit 0ad0124b5507202e2731da5a87d84adc1ea763ab. --- bindings/python/src/lib.rs | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/bindings/python/src/lib.rs b/bindings/python/src/lib.rs index 7a17519..c2806f8 100644 --- a/bindings/python/src/lib.rs +++ b/bindings/python/src/lib.rs @@ -1,20 +1,8 @@ use std::collections::HashMap; use pyo3::wrap_pymodule; -use pyo3::exceptions::RuntimeError; use pyo3::prelude::*; -fn runtime_error(message: String) -> PyErr { - RuntimeError::py_err(message) -} - -fn wrap_ironring_errors(result: Result) -> PyResult { - match result { - Ok(r) => Ok(r), - Err(e) => Err(runtime_error(format!("{:?}", e))), - } -} - #[pymodule] fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> { use ironring::name_hashes::*; @@ -37,27 +25,8 @@ fn name_hashes(_py: Python, m: &PyModule) -> PyResult<()> { Ok(()) } -#[pymodule] -fn unpack_bnd(_py: Python, m: &PyModule) -> PyResult<()> { - use ironring::unpackers::bnd::*; - use ironring::parsers::bnd::Bnd; - - #[pyfn(m, "load_bnd_file")] - fn py_load_bnd_file(_py: Python, bnd_path: &str) -> PyResult<(Bnd, Vec)> { - wrap_ironring_errors(load_bnd_file(bnd_path)) - } - - #[pyfn(m, "load_bnd")] - fn py_load_bnd(_py: Python, bnd_data: &[u8]) -> PyResult { - wrap_ironring_errors(load_bnd(bnd_data)) - } - - Ok(()) -} - #[pymodule] fn pyironring(_py: Python, m: &PyModule) -> PyResult<()> { m.add_wrapped(wrap_pymodule!(name_hashes))?; - m.add_wrapped(wrap_pymodule!(unpack_bnd))?; Ok(()) }