Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-16 21:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

pybind11.h: minor cleanups (no functionality change)

Browse Source
This commit is contained in:
Wenzel Jakob 2016-07-18 10:47:10 +02:00
parent 6969e7c1ba
commit 1f66a58427
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/pybind11/pybind11.h
View File

@ -421,15 +421,15 @@ protected:
/* When an exception is caught, give each registered exception /* When an exception is caught, give each registered exception
translator a chance to translate it to a Python exception translator a chance to translate it to a Python exception
in reverse order of registration. in reverse order of registration.
A translator may choose to do one of the following: A translator may choose to do one of the following:
- catch the exception and call PyErr_SetString or PyErr_SetObject - catch the exception and call PyErr_SetString or PyErr_SetObject
to set a standard (or custom) Python exception, or to set a standard (or custom) Python exception, or
- do nothing and let the exception fall through to the next translator, or - do nothing and let the exception fall through to the next translator, or
- delegate translation to the next translator by throwing a new type of exception. */ - delegate translation to the next translator by throwing a new type of exception. */
auto last_exception = std::current_exception(); auto last_exception = std::current_exception();
auto &registered_exception_translators = pybind11::detail::get_internals().registered_exception_translators; auto &registered_exception_translators = pybind11::detail::get_internals().registered_exception_translators;
for (auto& translator : registered_exception_translators) { for (auto& translator : registered_exception_translators) {
try { try {
@ -476,8 +476,7 @@ protected:
} }
msg += " Invoked with: "; msg += " Invoked with: ";
tuple args_(args, true); tuple args_(args, true);
for( std::size_t ti = overloads->is_constructor ? 1 : 0; ti < args_.size(); ++ti) for (size_t ti = overloads->is_constructor ? 1 : 0; ti < args_.size(); ++ti) {
{
msg += static_cast<std::string>(static_cast<object>(args_[ti]).str()); msg += static_cast<std::string>(static_cast<object>(args_[ti]).str());
if ((ti + 1) != args_.size() ) if ((ti + 1) != args_.size() )
msg += ", "; msg += ", ";