Merge pull request #38 from adler-j/issue-37__convert_exception

ENH: add more error conversions

Merge pull request #38 from adler-j/issue-37__convert_exception
ENH: add more error conversions
6621c17f · Wenzel Jakob · 3e426344 · 2b9fdbe7 · 6621c17f
Commit 6621c17f authored Dec 15, 2015 by Wenzel Jakob
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

include/pybind11/pybind11.h include/pybind11/pybind11.h +10 -4

No files found.
--- a/include/pybind11/pybind11.h
+++ b/include/pybind11/pybind11.h
@@ -297,6 +297,12 @@ private:
        } catch (const error_already_set &)      {                                                 return nullptr;
        } catch (const index_error &e)           { PyErr_SetString(PyExc_IndexError,    e.what()); return nullptr;
        } catch (const stop_iteration &e)        { PyErr_SetString(PyExc_StopIteration, e.what()); return nullptr;
+        } catch (const std::bad_alloc &e)        { PyErr_SetString(PyExc_MemoryError,   e.what()); return nullptr;
+        } catch (const std::domain_error &e)     { PyErr_SetString(PyExc_ValueError,    e.what()); return nullptr;
+        } catch (const std::invalid_argument &e) { PyErr_SetString(PyExc_ValueError,    e.what()); return nullptr;
+        } catch (const std::length_error &e)     { PyErr_SetString(PyExc_ValueError,    e.what()); return nullptr;
+        } catch (const std::out_of_range &e)     { PyErr_SetString(PyExc_IndexError,    e.what()); return nullptr;
+        } catch (const std::range_error &e)      { PyErr_SetString(PyExc_ValueError,    e.what()); return nullptr;
        } catch (const std::exception &e)        { PyErr_SetString(PyExc_RuntimeError,  e.what()); return nullptr;
        } catch (...) {
            PyErr_SetString(PyExc_RuntimeError, "Caught an unknown exception!");