mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-11 08:03:55 +00:00
git grep 0x03080000
cleanup.
This commit is contained in:
parent
2324df0995
commit
af537e72bb
@ -158,7 +158,7 @@ public:
|
|||||||
} else {
|
} else {
|
||||||
handle src_or_index = src;
|
handle src_or_index = src;
|
||||||
// PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls.
|
// PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls.
|
||||||
#if PY_VERSION_HEX < 0x03080000 || defined(PYPY_VERSION)
|
#if defined(PYPY_VERSION)
|
||||||
object index;
|
object index;
|
||||||
if (!PYBIND11_LONG_CHECK(src.ptr())) { // So: index_check(src.ptr())
|
if (!PYBIND11_LONG_CHECK(src.ptr())) { // So: index_check(src.ptr())
|
||||||
index = reinterpret_steal<object>(PyNumber_Index(src.ptr()));
|
index = reinterpret_steal<object>(PyNumber_Index(src.ptr()));
|
||||||
|
@ -466,19 +466,9 @@ extern "C" inline void pybind11_object_dealloc(PyObject *self) {
|
|||||||
|
|
||||||
type->tp_free(self);
|
type->tp_free(self);
|
||||||
|
|
||||||
#if PY_VERSION_HEX < 0x03080000
|
|
||||||
// `type->tp_dealloc != pybind11_object_dealloc` means that we're being called
|
|
||||||
// as part of a derived type's dealloc, in which case we're not allowed to decref
|
|
||||||
// the type here. For cross-module compatibility, we shouldn't compare directly
|
|
||||||
// with `pybind11_object_dealloc`, but with the common one stashed in internals.
|
|
||||||
auto pybind11_object_type = (PyTypeObject *) get_internals().instance_base;
|
|
||||||
if (type->tp_dealloc == pybind11_object_type->tp_dealloc)
|
|
||||||
Py_DECREF(type);
|
|
||||||
#else
|
|
||||||
// This was not needed before Python 3.8 (Python issue 35810)
|
// This was not needed before Python 3.8 (Python issue 35810)
|
||||||
// https://github.com/pybind/pybind11/issues/1946
|
// https://github.com/pybind/pybind11/issues/1946
|
||||||
Py_DECREF(type);
|
Py_DECREF(type);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string error_string();
|
std::string error_string();
|
||||||
|
@ -436,7 +436,7 @@ inline void translate_local_exception(std::exception_ptr p) {
|
|||||||
|
|
||||||
inline object get_python_state_dict() {
|
inline object get_python_state_dict() {
|
||||||
object state_dict;
|
object state_dict;
|
||||||
#if PYBIND11_INTERNALS_VERSION <= 4 || PY_VERSION_HEX < 0x03080000 || defined(PYPY_VERSION)
|
#if PYBIND11_INTERNALS_VERSION <= 4 || defined(PYPY_VERSION)
|
||||||
state_dict = reinterpret_borrow<object>(PyEval_GetBuiltins());
|
state_dict = reinterpret_borrow<object>(PyEval_GetBuiltins());
|
||||||
#else
|
#else
|
||||||
# if PY_VERSION_HEX < 0x03090000
|
# if PY_VERSION_HEX < 0x03090000
|
||||||
|
@ -19,7 +19,7 @@ PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
|
|||||||
PYBIND11_NAMESPACE_BEGIN(detail)
|
PYBIND11_NAMESPACE_BEGIN(detail)
|
||||||
|
|
||||||
inline void ensure_builtins_in_globals(object &global) {
|
inline void ensure_builtins_in_globals(object &global) {
|
||||||
#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x03080000
|
#if defined(PYPY_VERSION)
|
||||||
// Running exec and eval adds `builtins` module under `__builtins__` key to
|
// Running exec and eval adds `builtins` module under `__builtins__` key to
|
||||||
// globals if not yet present. Python 3.8 made PyRun_String behave
|
// globals if not yet present. Python 3.8 made PyRun_String behave
|
||||||
// similarly. Let's also do that for older versions, for consistency. This
|
// similarly. Let's also do that for older versions, for consistency. This
|
||||||
|
Loading…
Reference in New Issue
Block a user