pypy: support released 3.9

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
           "3.11-dev",
           "pypy-3.7",
           "pypy-3.8",
-          "pypy-3.9-v7.3.8rc1"
+          "pypy-3.9"
         ]
         platform:
           [
@@ -117,6 +117,8 @@ jobs:
             platform: { os: "windows-latest", python-architecture: "x86" }
           - python-version: pypy-3.8
             platform: { os: "windows-latest", python-architecture: "x86" }
+          - python-version: pypy-3.9
+            platform: { os: "windows-latest", python-architecture: "x86" }
         include:
           # Test minimal supported Rust version
           - rust: 1.48.0

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update `inventory` optional dependency to 0.2. [#2019](https://github.com/PyO3/pyo3/pull/2019)
 - Drop `paste` dependency. [#2081](https://github.com/PyO3/pyo3/pull/2081)
 - The bindings found `pyo3::ffi` are now a re-export of the new `pyo3-ffi` crate. [#2126](https://github.com/PyO3/pyo3/pull/2126)
+- Support PyPy 3.9. [#2143](https://github.com/PyO3/pyo3/pull/2143)
+
 
 ### Added
 

src/instance.rs

@@ -583,7 +583,7 @@ impl<T> Py<T> {
     /// This is equivalent to the Python expression `self()`.
     pub fn call0(&self, py: Python) -> PyResult<PyObject> {
         cfg_if::cfg_if! {
-            if #[cfg(Py_3_9)] {
+            if #[cfg(all(Py_3_9, not(PyPy)))] {
                 // Optimized path on python 3.9+
                 unsafe {
                     PyObject::from_owned_ptr_or_err(py, ffi::PyObject_CallNoArgs(self.as_ptr()))
@@ -636,7 +636,7 @@ impl<T> Py<T> {
     /// This is equivalent to the Python expression `self.name()`.
     pub fn call_method0(&self, py: Python, name: &str) -> PyResult<PyObject> {
         cfg_if::cfg_if! {
-            if #[cfg(all(Py_3_9, not(Py_LIMITED_API)))] {
+            if #[cfg(all(Py_3_9, not(any(Py_LIMITED_API, PyPy))))] {
                 // Optimized path on python 3.9+
                 unsafe {
                     let name = name.into_py(py);

src/pyclass.rs

@@ -218,7 +218,7 @@ fn type_object_creation_failed(py: Python, e: PyErr, name: &'static str) -> ! {
 /// Additional type initializations necessary before Python 3.10
 #[cfg(all(not(Py_LIMITED_API), not(Py_3_10)))]
 unsafe fn tp_init_additional(
-    type_object: *mut ffi::PyTypeObject,
+    _type_object: *mut ffi::PyTypeObject,
     _tp_doc: &str,
     #[cfg(not(Py_3_9))] buffer_procs: &ffi::PyBufferProcs,
     #[cfg(not(Py_3_9))] dict_offset: Option<ffi::Py_ssize_t>,
@@ -236,10 +236,10 @@ unsafe fn tp_init_additional(
             // heap-types, and it removed the text_signature value from it.
             // We go in after the fact and replace tp_doc with something
             // that _does_ include the text_signature value!
-            ffi::PyObject_Free((*type_object).tp_doc as _);
+            ffi::PyObject_Free((*_type_object).tp_doc as _);
             let data = ffi::PyObject_Malloc(_tp_doc.len());
             data.copy_from(_tp_doc.as_ptr() as _, _tp_doc.len());
-            (*type_object).tp_doc = data as _;
+            (*_type_object).tp_doc = data as _;
         }
     }
 

src/types/any.rs

@@ -333,7 +333,7 @@ impl PyAny {
     /// This is equivalent to the Python expression `help()`.
     pub fn call0(&self) -> PyResult<&PyAny> {
         cfg_if::cfg_if! {
-            if #[cfg(Py_3_9)] {
+            if #[cfg(all(Py_3_9, not(PyPy)))] {
                 // Optimized path on python 3.9+
                 unsafe {
                     self.py().from_owned_ptr_or_err(ffi::PyObject_CallNoArgs(self.as_ptr()))
@@ -461,7 +461,7 @@ impl PyAny {
     /// ```
     pub fn call_method0(&self, name: &str) -> PyResult<&PyAny> {
         cfg_if::cfg_if! {
-            if #[cfg(all(Py_3_9, not(Py_LIMITED_API)))] {
+            if #[cfg(all(Py_3_9, not(any(Py_LIMITED_API, PyPy))))] {
                 // Optimized path on python 3.9+
                 unsafe {
                     let name = name.into_py(self.py());