Skip to content

Refactor pyo3 usage #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LilyFirefly merged 6 commits into from
Aug 4, 2025
Merged

Refactor pyo3 usage #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6455f6c
Use PyO3 declarative module syntax
LilyFirefly Aug 1, 2025
9dc68e6
Raise a ValueError instead of panicking for invalid language
LilyFirefly Aug 1, 2025
76af155
Use tuple unpacking in for loop
LilyFirefly Aug 1, 2025
245266e
Simplify setting FluentArgs based on Python type
LilyFirefly Aug 1, 2025
ab7c4b1
Move errors Vec next to bundle.format_pattern call site
LilyFirefly Aug 1, 2025
e0e068d
Simplify non-strict error handling with tuple unpacking
LilyFirefly Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,14 @@ mod rustfluent {
ftl_filenames: &'_ Bound<'_, PyList>,
strict: bool,
) -> PyResult<Self> {
let langid: LanguageIdentifier = language.parse().expect("Parsing failed");
let langid: LanguageIdentifier = match language.parse() {
Ok(langid) => langid,
Err(_) => {
return Err(PyValueError::new_err(format!(
"Invalid language: '{language}'"
)));
}
};
let mut bundle = FluentBundle::new_concurrent(vec![langid]);

for file_path in ftl_filenames.iter() {
Expand Down
7 changes: 7 additions & 0 deletions tests/test_python_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def test_variables_of_different_types(description, identifier, variables, expect
assert result == expected


def test_invalid_language():
with pytest.raises(ValueError) as exc_info:
fluent.Bundle("$", [])

assert str(exc_info.value) == "Invalid language: '$'"
Copy link
Collaborator

@seddonym seddonym Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐼 Could do this using with pytest.raises(Value, match="..."):.

Copy link
Contributor Author

@LilyFirefly LilyFirefly Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could, but I don't really like it because then I have to deal with regexes and escaping. This way it's an exact match.



@pytest.mark.parametrize(
"key",
(
Expand Down