mii/tokenizers
1
0
Fork 0
mirror of https://github.com/mii443/tokenizers.git synced 2025-08-23 16:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PyO3 (#426)

Browse Source
This commit is contained in:
Anthony MOI
2020-09-22 12:00:20 -04:00
committed by GitHub
parent 8e220dbdd4
commit 940f8bd8fa
13 changed files with 156 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/python/src/error.rs
View File

@ -1,5 +1,6 @@
use pyo3::exceptions;
use pyo3::prelude::*;
use pyo3::type_object::PyTypeObject;
use std::fmt::{Display, Formatter, Result as FmtResult};
use tokenizers::tokenizer::Result;
@ -9,8 +10,8 @@ impl PyError {
pub fn from(s: &str) -> Self {
PyError(String::from(s))
}
pub fn into_pyerr(self) -> PyErr {
exceptions::Exception::py_err(format!("{}", self))
pub fn into_pyerr<T: PyTypeObject>(self) -> PyErr {
PyErr::new::<T, _>(format!("{}", self))
}
}
impl Display for PyError {
@ -24,7 +25,7 @@ pub struct ToPyResult<T>(pub Result<T>);
impl<T> std::convert::Into<PyResult<T>> for ToPyResult<T> {
fn into(self) -> PyResult<T> {
self.0
.map_err(|e| exceptions::Exception::py_err(format!("{}", e)))
.map_err(|e| exceptions::PyException::new_err(format!("{}", e)))
}
}
impl<T> ToPyResult<T> {