Move out all version-dependent functions.

Author: adalisk-emikhaylov

include/pybind11/detail/class.h

@@ -180,28 +180,12 @@ std::string error_string();
 
 /// dynamic_attr: Allow the garbage collector to traverse the internal instance `__dict__`.
 extern "C" inline int pybind11_traverse(PyObject *self, visitproc visit, void *arg) {
-#if PY_VERSION_HEX >= 0x030D0000
-    PyObject_VisitManagedDict(self, visit, arg);
-#else
-    PyObject *&dict = *non_limited_api::_PyObject_GetDictPtr(self);
-    Py_VISIT(dict);
-#endif
-// https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_traverse
-#if PY_VERSION_HEX >= 0x03090000
-    Py_VISIT(Py_TYPE(self));
-#endif
-    return 0;
+    return non_limited_api::pybind11_traverse(self, visit, arg);
 }
 
 /// dynamic_attr: Allow the GC to clear the dictionary.
 extern "C" inline int pybind11_clear(PyObject *self) {
-#if PY_VERSION_HEX >= 0x030D0000
-    PyObject_ClearManagedDict(self);
-#else
-    PyObject *&dict = *non_limited_api::_PyObject_GetDictPtr(self);
-    Py_CLEAR(dict);
-#endif
-    return 0;
+    return non_limited_api::pybind11_clear(self);
 }
 
 /** Create a brand new Python type according to the `type_record` specification.

include/pybind11/detail/internals.h

@@ -37,7 +37,8 @@
 /// further ABI-incompatible changes may be made before the ABI is officially
 /// changed to the new version.
 #ifndef PYBIND11_INTERNALS_VERSION
-#    if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
+// Hardcoding a same default value for compatibility with all python versions
+#    if 1 // PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
 // Version bump for Python 3.12+, before first 3.12 beta release.
 // Version bump for MSVC piggy-backed on PR #4779. See comments there.
 #        ifdef Py_GIL_DISABLED

include/pybind11/detail/non_limited_api.h

@@ -42,6 +42,7 @@ class handle;
 class memoryview;
 struct buffer_info;
 struct InitializingFunctionRecordDeleter;
+class dict;
 
 PYBIND11_NAMESPACE_BEGIN(detail)
 class generic_type;
@@ -183,6 +184,10 @@ PYBIND11_NONLIMITEDAPI_FUNC(bool, PyObjectIsInstanceWithOneOfTpNames, (PyObject
 PYBIND11_NONLIMITEDAPI_FUNC(int, PyGen_Check_, (PyObject *obj), (obj))
 PYBIND11_NONLIMITEDAPI_FUNC(PyInterpreterState *, PyInterpreterState_Get, (), ())
 PYBIND11_NONLIMITEDAPI_FUNC(PyObject *, PyInterpreterState_GetDict, (PyInterpreterState *state), (state))
+PYBIND11_NONLIMITEDAPI_FUNC(int, pybind11_traverse, (PyObject *self, visitproc visit, void *arg), (self, visit, arg))
+PYBIND11_NONLIMITEDAPI_FUNC(int, pybind11_clear, (PyObject *self), (self))
+PYBIND11_NONLIMITEDAPI_FUNC(void, globals, (dict &out), (out))
+PYBIND11_NONLIMITEDAPI_FUNC(PyObject *, dict_getitemstringref, (PyObject *v, const char *key), (v, key))
 
 PYBIND11_NAMESPACE_END(non_limited_api)
 PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)

include/pybind11/embed.h

@@ -96,6 +96,7 @@ inline void precheck_interpreter() {
 #    define PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX (0x03080000)
 #endif
 
+// NOTE: Not patching out this use of `PY_VERSION_HEX` because we don't support versions <3.8, and I belive Pybind itself also doesn't anymore.
 #if PY_VERSION_HEX < PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
 inline void initialize_interpreter_pre_pyconfig(bool init_signal_handlers,
                                                 int argc,
@@ -127,6 +128,7 @@ inline void initialize_interpreter_pre_pyconfig(bool init_signal_handlers,
 
 PYBIND11_NAMESPACE_END(detail)
 
+// NOTE: Not patching out this use of `PY_VERSION_HEX` because we don't support versions <3.8, and I belive Pybind itself also doesn't anymore.
 #if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
 inline void initialize_interpreter(PyConfig *config,
                                    int argc = 0,
@@ -245,6 +247,7 @@ class scoped_interpreter {
         initialize_interpreter(init_signal_handlers, argc, argv, add_program_dir_to_path);
     }
 
+// NOTE: Not patching out this use of `PY_VERSION_HEX` because we don't support versions <3.8, and I belive Pybind itself also doesn't anymore.
 #if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
     explicit scoped_interpreter(PyConfig *config,
                                 int argc = 0,

include/pybind11/pybind11.h

@@ -1065,14 +1065,9 @@ using module = module_;
 /// Return a dictionary representing the global variables in the current execution frame,
 /// or ``__main__.__dict__`` if there is no frame (usually when the interpreter is embedded).
 inline dict globals() {
-#if PY_VERSION_HEX >= 0x030d0000
-    PyObject *p = PyEval_GetFrameGlobals();
-    return p ? reinterpret_steal<dict>(p)
-             : reinterpret_borrow<dict>(module_::import("__main__").attr("__dict__").ptr());
-#else
-    PyObject *p = PyEval_GetGlobals();
-    return reinterpret_borrow<dict>(p ? p : module_::import("__main__").attr("__dict__").ptr());
-#endif
+    dict ret;
+    non_limited_api::globals(ret);
+    return ret;
 }
 
 template <typename... Args, typename = detail::enable_if_t<args_are_all_keyword_or_ds<Args...>()>>

include/pybind11/pytypes.h

@@ -511,7 +511,8 @@ struct error_fetch_and_normalize {
                             "of the original active exception type.");
         }
         m_lazy_error_string = exc_type_name_orig;
-#if PY_VERSION_HEX >= 0x030C0000
+// NOTE: Patching out this entirely for compatibility with all python versions.
+#if 0 && PY_VERSION_HEX >= 0x030C0000
         // The presence of __notes__ is likely due to exception normalization
         // errors, although that is not necessarily true, therefore insert a
         // hint only:
@@ -844,20 +845,7 @@ inline PyObject *dict_getitem(PyObject *v, PyObject *key) {
 }
 
 inline PyObject *dict_getitemstringref(PyObject *v, const char *key) {
-#if PY_VERSION_HEX >= 0x030D0000
-    PyObject *rv;
-    if (PyDict_GetItemStringRef(v, key, &rv) < 0) {
-        throw error_already_set();
-    }
-    return rv;
-#else
-    PyObject *rv = dict_getitemstring(v, key);
-    if (rv == nullptr && PyErr_Occurred()) {
-        throw error_already_set();
-    }
-    Py_XINCREF(rv);
-    return rv;
-#endif
+    return non_limited_api::dict_getitemstringref(v, key);
 }
 
 // Helper aliases/functions to support implicit casting of values given to python

source/non_limited_api/non_limited_api.cpp

@@ -1849,3 +1849,59 @@ PyInterpreterState *pybind11::non_limited_api::pybind11NLA_PyInterpreterState_Ge
     return ::PyInterpreterState_Get();
     #endif
 }
+
+int pybind11::non_limited_api::pybind11NLA_pybind11_traverse(PyObject *self, visitproc visit, void *arg)
+{
+#if PY_VERSION_HEX >= 0x030D0000
+    PyObject_VisitManagedDict(self, visit, arg);
+#else
+    PyObject *&dict = *non_limited_api::_PyObject_GetDictPtr(self);
+    Py_VISIT(dict);
+#endif
+// https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_traverse
+#if PY_VERSION_HEX >= 0x03090000
+    Py_VISIT(Py_TYPE(self));
+#endif
+    return 0;
+}
+
+int pybind11::non_limited_api::pybind11NLA_pybind11_clear(PyObject *self)
+{
+#if PY_VERSION_HEX >= 0x030D0000
+    PyObject_ClearManagedDict(self);
+#else
+    PyObject *&dict = *non_limited_api::_PyObject_GetDictPtr(self);
+    Py_CLEAR(dict);
+#endif
+    return 0;
+}
+
+void pybind11::non_limited_api::pybind11NLA_globals(dict &out)
+{
+#if PY_VERSION_HEX >= 0x030d0000
+    PyObject *p = PyEval_GetFrameGlobals();
+    out = p ? reinterpret_steal<dict>(p)
+             : reinterpret_borrow<dict>(module_::import("__main__").attr("__dict__").ptr());
+#else
+    PyObject *p = PyEval_GetGlobals();
+    out = reinterpret_borrow<dict>(p ? p : module_::import("__main__").attr("__dict__").ptr());
+#endif
+}
+
+PyObject *pybind11::non_limited_api::pybind11NLA_dict_getitemstringref(PyObject *v, const char *key)
+{
+#if PY_VERSION_HEX >= 0x030D0000
+    PyObject *rv;
+    if (PyDict_GetItemStringRef(v, key, &rv) < 0) {
+        throw error_already_set();
+    }
+    return rv;
+#else
+    PyObject *rv = dict_getitemstring(v, key);
+    if (rv == nullptr && PyErr_Occurred()) {
+        throw error_already_set();
+    }
+    Py_XINCREF(rv);
+    return rv;
+#endif
+}