Use built-in eval() instead of function_record_pickle_helper()

rwgk · rwgk · commit 0e7bb1034e3a · 2024-02-14T07:57:08.000-08:00
Much simpler!

(Note that the `function_record_pickle_helper()` code is NOT removed in this commit.)

This approach was discovered in an attempt to solve the problem that
stubgen picks up `_function_record_pickle_helper_v1`.

For example (tensorflow_text/core/pybinds/tflite_registrar.pyi):

```diff
+from typing import Any
+
+def _function_record_pickle_helper_v1(*args, **kwargs) -&gt; Any: ...
```
diff --git a/include/pybind11/detail/function_record_pyobject.h b/include/pybind11/detail/function_record_pyobject.h
@@ -214,8 +214,9 @@ inline PyObject *reduce_ex_impl(PyObject *self, PyObject *, PyObject *) {
         && PyModule_Check(rec->scope.ptr()) != 0) {
         object scope_module = get_scope_module(rec->scope);
         if (scope_module) {
-            return make_tuple(get_function_record_pickle_helper(rec->scope),
-                              make_tuple(make_tuple(scope_module, rec->name)))
+            return make_tuple(reinterpret_borrow<object>(PyEval_GetBuiltins())["eval"],
+                              make_tuple(str("__import__('importlib').import_module('")
+                                         + scope_module + str("')")))
                 .release()
                 .ptr();
         }
diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
@@ -561,11 +561,6 @@ class cpp_function : public function {
             guarded_strdup.release();
 
             object scope_module = detail::get_scope_module(rec->scope);
-            if (rec->name != nullptr && rec->name[0] != '\0' && rec->scope
-                && PyModule_Check(rec->scope.ptr()) != 0 && scope_module) {
-                // Call-once initialization.
-                detail::get_function_record_pickle_helper(rec->scope);
-            }
             m_ptr = PyCFunction_NewEx(rec->def, py_func_rec.ptr(), scope_module.ptr());
             if (!m_ptr) {
                 pybind11_fail("cpp_function::cpp_function(): Could not allocate function object");
