Skip to content

Commit 1dfe1be

Browse files
author
William Tisäter
committed
Do not wrap exceptions in Exception
1 parent 5ca38cf commit 1dfe1be

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rsmime"
3-
version = "0.3.0"
3+
version = "0.3.1"
44
edition = "2021"
55

66
[lib]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "maturin"
44

55
[project]
66
name = "rsmime"
7-
version = "0.3.0"
7+
version = "0.3.1"
88
classifiers = [
99
"License :: OSI Approved :: MIT License",
1010
"Development Status :: 3 - Alpha",

rsmime.pyi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1+
class ReadCertificateError(Exception):
2+
...
3+
4+
class LoadCertificateError(Exception):
5+
...
6+
7+
class SignError(Exception):
8+
...
9+
110
def sign(cert_file: str, key_file: str, data_to_sign: bytes) -> str:
211
...

src/lib.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,8 @@ pub fn _sign(cert_file: &str, key_file: &str, data_to_sign: &[u8]) -> PyResult<V
3737
#[pyfunction]
3838
fn sign(cert_file: &str, key_file: &str, data_to_sign: Vec<u8>) -> PyResult<String> {
3939
match _sign(cert_file, key_file, &data_to_sign) {
40-
Ok(signed_data) => {
41-
match String::from_utf8(signed_data) {
42-
Ok(signed_string) => Ok(signed_string),
43-
Err(err) => Err(PyException::new_err(err))
44-
}
45-
},
46-
Err(err) => Err(PyException::new_err(err.to_string())),
40+
Ok(signed_data) => Ok(String::from_utf8(signed_data).expect("Failed to convert to string")),
41+
Err(err) => Err(err),
4742
}
4843
}
4944

0 commit comments

Comments
 (0)