Skip to content
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.

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

Update for Pyo3 0.23 #1289

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update for Pyo3 0.23 #1289

wants to merge 4 commits into from

Conversation

ngoldbaum
Copy link

Summary

Updates the native library to use PyO3 0.23. This is the first step towards declaring support for the free-threaded interpreter.

I could have gone further in ripping out TryIntoPy in favor of IntoPyObject. If you'd prefer not to leave this project in a state with an unnecessary wrapper trait I'm happy to implement that, I just wanted to make the smallest possible working diff.

Test Plan

This passes the tests for me locally. Let's see if CI spots and issues.

@facebook-github-bot
Copy link

Hi @ngoldbaum!

Thank you for your pull request.

We require contributors to sign our Contributor License Agreement, and yours needs attention.

You currently have a record in our system, but the CLA is no longer valid, and will need to be resubmitted.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

@ngoldbaum
Copy link
Author

I signed the CLA.

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jan 28, 2025
@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

}
}

impl TryIntoPy<PyObject> for PyTuple {
Copy link
Author

Choose a reason for hiding this comment

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

I found that with IntoPyObject that some of these impls aren't needed at all. I didn't look too closely to try to understand why though so there could be something subtle happening.

}() {
Ok(py_err_value) => PyErr::from_value(py_err_value),
Err(e) => e,
}
Copy link
Author

@ngoldbaum ngoldbaum Jan 28, 2025

Choose a reason for hiding this comment

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

Since ultimately we want a PyErr in both the success and error cases, we can make use of a closure that returns a result and ? to avoid unwrap or expect in the new into_pyobject() calls that can return errors and at the same time clean up some unnecessary pre-existing expect use to turn some panics into errors. This is a neat Rust trick, unfortuntely it's only convenient in error handling code.

})
}
}

impl<'a> PyErrArguments for Details {
Copy link
Author

Choose a reason for hiding this comment

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

Both this and Details are unused and the compiler warns about them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants