Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-28 08:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Python 3.11 support (#3694)

Browse Source 
* Test out Python 3.11 migration

* Clean up a bit

* Remove todo

* Test workaround

* Fix potential bug uncovered in 3.11

* Try to fix it more

* last ditch fix

* Revert. Tp-traverse isn't the problem

* Test workaround

* Try this hack

* Revert MRO changes

* Use f_back properly

* Qualify auto

* Update include/pybind11/pybind11.h

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Simplify code slightly

* Ensure co_varnames decref if dict_getitem throws

* Eager decref f_code

Co-authored-by: Henry Schreiner <HenrySchreinerIII@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Aaron Gokaslan 2022-03-02 13:17:52 -05:00 committed by Henry Schreiner
parent bdec573794
commit 6f01c60ad0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/pybind11/detail/type_caster_base.h
View File

@ -510,9 +510,10 @@ PYBIND11_NOINLINE std::string error_string() {
} }
PyFrameObject *frame = trace->tb_frame; PyFrameObject *frame = trace->tb_frame;
Py_XINCREF(frame);
errorString += "\n\nAt:\n"; errorString += "\n\nAt:\n";
while (frame) { while (frame) {
# if PY_VERSION_HEX >= 0x03090000 # if PY_VERSION_HEX >= 0x030900B1
PyCodeObject *f_code = PyFrame_GetCode(frame); PyCodeObject *f_code = PyFrame_GetCode(frame);
# else # else
PyCodeObject *f_code = frame->f_code; PyCodeObject *f_code = frame->f_code;
@ -522,8 +523,15 @@ PYBIND11_NOINLINE std::string error_string() {
errorString += " " + handle(f_code->co_filename).cast<std::string>() + "(" errorString += " " + handle(f_code->co_filename).cast<std::string>() + "("
+ std::to_string(lineno) + std::to_string(lineno)
+ "): " + handle(f_code->co_name).cast<std::string>() + "\n"; + "): " + handle(f_code->co_name).cast<std::string>() + "\n";
frame = frame->f_back;
Py_DECREF(f_code); Py_DECREF(f_code);
# if PY_VERSION_HEX >= 0x030900B1
auto *b_frame = PyFrame_GetBack(frame);
# else
auto *b_frame = frame->f_back;
Py_XINCREF(b_frame);
# endif
Py_DECREF(frame);
frame = b_frame;
} }
} }
#endif #endif

12
include/pybind11/pybind11.h
View File

@ -2671,9 +2671,7 @@ get_type_override(const void *this_ptr, const type_info *this_type, const char *
/* Don't call dispatch code if invoked from overridden function. /* Don't call dispatch code if invoked from overridden function.
Unfortunately this doesn't work on PyPy. */ Unfortunately this doesn't work on PyPy. */
#if !defined(PYPY_VERSION) && PY_VERSION_HEX < 0x030B0000 #if !defined(PYPY_VERSION)
// TODO: Remove PyPy workaround for Python 3.11.
// Current API fails on 3.11 since co_varnames can be null.
# if PY_VERSION_HEX >= 0x03090000 # if PY_VERSION_HEX >= 0x03090000
PyFrameObject *frame = PyThreadState_GetFrame(PyThreadState_Get()); PyFrameObject *frame = PyThreadState_GetFrame(PyThreadState_Get());
if (frame != nullptr) { if (frame != nullptr) {
@ -2681,9 +2679,11 @@ get_type_override(const void *this_ptr, const type_info *this_type, const char *
// f_code is guaranteed to not be NULL // f_code is guaranteed to not be NULL
if ((std::string) str(f_code->co_name) == name && f_code->co_argcount > 0) { if ((std::string) str(f_code->co_name) == name && f_code->co_argcount > 0) {
PyObject *locals = PyEval_GetLocals(); PyObject *locals = PyEval_GetLocals();
if (locals != nullptr && f_code->co_varnames != nullptr) { if (locals != nullptr) {
PyObject *self_caller PyObject *co_varnames = PyObject_GetAttrString((PyObject *) f_code, "co_varnames");
= dict_getitem(locals, PyTuple_GET_ITEM(f_code->co_varnames, 0)); PyObject *self_arg = PyTuple_GET_ITEM(co_varnames, 0);
Py_DECREF(co_varnames);
PyObject *self_caller = dict_getitem(locals, self_arg);
if (self_caller == self.ptr()) { if (self_caller == self.ptr()) {
Py_DECREF(f_code); Py_DECREF(f_code);
Py_DECREF(frame); Py_DECREF(frame);