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

merge master into abi3, resolving conflicts #1172

Merged
merged 11 commits into from
Sep 13, 2020
Merged

Conversation

alex
Copy link
Contributor

@alex alex commented Sep 10, 2020

No description provided.

sebpuetz and others added 10 commits September 8, 2020 09:51
Add bindings for PyCFunction, PyFunction, PyClassMethod and
PyStaticMethod.
Change add_function to take `&PyCFunction` instead of a wrapper
fn and ensure that dostrings of functions are `&'static str`.
Implement std::error::Error for PyErr
src/err/mod.rs Outdated Show resolved Hide resolved
@kngwyu
Copy link
Member

kngwyu commented Sep 12, 2020

Thanks!

Co-authored-by: Yuji Kanagawa <[email protected]>
@kngwyu kngwyu merged commit afc2d10 into PyO3:abi3 Sep 13, 2020
@alex alex deleted the abi3-merge-master branch September 13, 2020 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants