Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-03-03 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

exception constructor consistency improvements (fixes #492)

Browse Source
This commit is contained in:
Wenzel Jakob 2016-11-16 17:59:56 +01:00
parent 5027c4f95b
commit 281ccc692c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/pybind11/pybind11.h
View File

@ -1429,12 +1429,14 @@ void register_exception_translator(ExceptionTranslator&& translator) {
template <typename type> template <typename type>
class exception : public object { class exception : public object {
public: public:
exception(module &m, const std::string &name, PyObject* base=PyExc_Exception) { exception(handle scope, const char *name, PyObject *base = PyExc_Exception) {
std::string full_name = std::string(PyModule_GetName(m.ptr())) std::string full_name = scope.attr("__name__").cast<std::string>() +
+ std::string(".") + name; std::string(".") + name;
char* exception_name = const_cast<char*>(full_name.c_str()); m_ptr = PyErr_NewException((char *) full_name.c_str(), base, NULL);
m_ptr = PyErr_NewException(exception_name, base, NULL); if (hasattr(scope, name))
m.add_object(name.c_str(), *this); pybind11_fail("Error during initialization: multiple incompatible "
"definitions with name \"" + std::string(name) + "\"");
scope.attr(name) = *this;
} }
// Sets the current python exception to this exception object with the given message // Sets the current python exception to this exception object with the given message
@ -1448,14 +1450,16 @@ public:
* This is intended for simple exception translations; for more complex translation, register the * This is intended for simple exception translations; for more complex translation, register the
* exception object and translator directly. * exception object and translator directly.
*/ */
template <typename CppException> exception<CppException>& register_exception(module &m, const std::string &name, PyObject* base = PyExc_Exception) { template <typename CppException>
static exception<CppException> ex(m, name, base); exception<CppException> &register_exception(handle scope,
const char *name,
PyObject *base = PyExc_Exception) {
static exception<CppException> ex(scope, name, base);
register_exception_translator([](std::exception_ptr p) { register_exception_translator([](std::exception_ptr p) {
if (!p) return; if (!p) return;
try { try {
std::rethrow_exception(p); std::rethrow_exception(p);
} } catch (const CppException &e) {
catch (const CppException &e) {
ex(e.what()); ex(e.what());
} }
}); });