Merge branch 'master' into sh_merge_master

This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-07-12 18:37:15 -07:00
commit 0ec9e31bbf
2 changed files with 3 additions and 3 deletions

View File

@ -33,7 +33,7 @@ repos:
# Upgrade old Python syntax # Upgrade old Python syntax
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: "v2.34.0" rev: "v2.37.1"
hooks: hooks:
- id: pyupgrade - id: pyupgrade
args: [--py36-plus] args: [--py36-plus]
@ -73,7 +73,7 @@ repos:
# Autoremoves unused imports # Autoremoves unused imports
- repo: https://github.com/hadialqattan/pycln - repo: https://github.com/hadialqattan/pycln
rev: "v1.3.5" rev: "v2.0.1"
hooks: hooks:
- id: pycln - id: pycln
stages: [manual] stages: [manual]

View File

@ -1653,7 +1653,7 @@ unpacking_collector<policy> collect_arguments(Args &&...args) {
template <typename Derived> template <typename Derived>
template <return_value_policy policy, typename... Args> template <return_value_policy policy, typename... Args>
object object_api<Derived>::operator()(Args &&...args) const { object object_api<Derived>::operator()(Args &&...args) const {
#if defined(PYBIND11_DETAILED_ERROR_MESSAGES) #ifndef NDEBUG
if (!PyGILState_Check()) { if (!PyGILState_Check()) {
pybind11_fail("pybind11::object_api<>::operator() PyGILState_Check() failure."); pybind11_fail("pybind11::object_api<>::operator() PyGILState_Check() failure.");
} }