Add ABI facade support for pristine PyO3 packages

Author: smarcd

Cargo.lock

@@ -31,6 +31,7 @@ tkinter = ["rustpython-stdlib/tkinter"]
 winresource = "0.1"
 
 [dependencies]
+rustpython-capi = { path = "crates/capi" }
 rustpython-compiler = { workspace = true }
 rustpython-pylib = { workspace = true, optional = true }
 rustpython-stdlib = { workspace = true, optional = true, features = ["compiler"] }
@@ -53,7 +54,7 @@ rustyline = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true }
-pyo3 = { git = "https://github.com/bschoenmaeckers/pyo3", branch = "RustPython", features = ["auto-initialize"] }
+pyo3 = { path = "/tmp/pyo3-abi-facade", features = ["auto-initialize"] }
 rustpython-stdlib = { workspace = true }
 ruff_python_parser = { workspace = true }
 
@@ -102,7 +103,7 @@ lto = "thin"
 
 [patch.crates-io]
 parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
-pyo3-ffi = { git = "https://github.com/bschoenmaeckers/pyo3", branch = "RustPython" }
+pyo3-ffi = { path = "/tmp/pyo3-abi-facade/pyo3-ffi" }
 # REDOX START, Uncomment when you want to compile/check with redoxer
 # REDOX END
 

Cargo.toml

@@ -16,8 +16,24 @@
 
 __all__ = [
     'ChainMap',
+    'Collection',
+    'Container',
     'Counter',
+    'Callable',
+    'Iterable',
+    'Iterator',
+    'ItemsView',
+    'KeysView',
     'OrderedDict',
+    'Mapping',
+    'MappingView',
+    'MutableMapping',
+    'MutableSet',
+    'Reversible',
+    'Sequence',
+    'Set',
+    'Sized',
+    'ValuesView',
     'UserDict',
     'UserList',
     'UserString',
@@ -32,6 +48,25 @@
 _sys.modules['collections.abc'] = _collections_abc
 abc = _collections_abc
 
+# Compatibility aliases for packages which still import ABCs from
+# `collections` instead of `collections.abc`.
+Collection = _collections_abc.Collection
+Container = _collections_abc.Container
+Callable = _collections_abc.Callable
+Iterable = _collections_abc.Iterable
+Iterator = _collections_abc.Iterator
+ItemsView = _collections_abc.ItemsView
+KeysView = _collections_abc.KeysView
+Mapping = _collections_abc.Mapping
+MappingView = _collections_abc.MappingView
+MutableMapping = _collections_abc.MutableMapping
+MutableSet = _collections_abc.MutableSet
+Reversible = _collections_abc.Reversible
+Sequence = _collections_abc.Sequence
+Set = _collections_abc.Set
+Sized = _collections_abc.Sized
+ValuesView = _collections_abc.ValuesView
+
 from itertools import chain as _chain
 from itertools import repeat as _repeat
 from itertools import starmap as _starmap

Lib/collections/__init__.py

@@ -1,5 +1,11 @@
 fn main() {
-    if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "windows" {
+    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
+
+    if target_os != "windows" {
+        println!("cargo:rustc-link-arg-bin=rustpython=-Wl,-export_dynamic");
+    }
+
+    if target_os == "windows" {
         println!("cargo:rerun-if-changed=logo.ico");
         let mut res = winresource::WindowsResource::new();
         if std::path::Path::new("logo.ico").exists() {

build.rs

@@ -8,20 +8,18 @@ rust-version.workspace = true
 repository.workspace = true
 license.workspace = true
 
-[lib]
-crate-type = ["cdylib"]
-
 [dependencies]
 bitflags.workspace = true
+libc.workspace = true
+libloading = "0.9"
 num-complex.workspace = true
 rustpython-vm = { workspace = true, features = ["threading", "compiler"]}
 
-[features]
-# Enable PyObject_CallMethodObjArgs variadic function, which is only available on nightly Rust.
-nightly = []
+[build-dependencies]
+cc = "1"
 
 [dev-dependencies]
-pyo3 = { git = "https://github.com/bschoenmaeckers/pyo3", branch = "RustPython", features = ["auto-initialize", "abi3"] }
+pyo3 = { path = "/tmp/pyo3-abi-facade", features = ["auto-initialize", "abi3"] }
 
 [lints]
 workspace = true

crates/capi/Cargo.toml

@@ -0,0 +1,6 @@
+fn main() {
+    println!("cargo:rerun-if-changed=csrc/pyobject_callmethodobjargs.c");
+    cc::Build::new()
+        .file("csrc/pyobject_callmethodobjargs.c")
+        .compile("rustpython_capi_shims");
+}

crates/capi/build.rs

@@ -0,0 +1,45 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+typedef struct _object PyObject;
+
+extern PyObject *RustPython_PyObject_CallMethodObjArgsArray(
+    PyObject *receiver,
+    PyObject *name,
+    PyObject *const *args,
+    size_t nargs
+);
+
+PyObject *PyObject_CallMethodObjArgs(PyObject *receiver, PyObject *name, ...) {
+    va_list ap;
+    size_t nargs = 0;
+
+    va_start(ap, name);
+    while (va_arg(ap, PyObject *) != NULL) {
+        nargs++;
+    }
+    va_end(ap);
+
+    PyObject **args = NULL;
+    if (nargs > 0) {
+        args = (PyObject **)malloc(sizeof(PyObject *) * nargs);
+        if (args == NULL) {
+            return NULL;
+        }
+        va_start(ap, name);
+        for (size_t i = 0; i < nargs; i++) {
+            args[i] = va_arg(ap, PyObject *);
+        }
+        (void)va_arg(ap, PyObject *);
+        va_end(ap);
+    }
+
+    PyObject *result = RustPython_PyObject_CallMethodObjArgsArray(receiver, name, args, nargs);
+    free(args);
+    return result;
+}
+
+void *RustPython_Keep_PyObject_CallMethodObjArgs(void) {
+    return (void *)&PyObject_CallMethodObjArgs;
+}