Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
35045eee
Commit
35045eee
authored
May 03, 2019
by
martinRenou
Committed by
Wenzel Jakob
May 03, 2019
Browse files
Add getters for exception type, value and traceback (#1641)
parent
9bb33131
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
include/pybind11/pybind11.h
include/pybind11/pybind11.h
+4
-4
include/pybind11/pytypes.h
include/pybind11/pytypes.h
+8
-4
No files found.
include/pybind11/pybind11.h
View file @
35045eee
...
...
@@ -1987,12 +1987,12 @@ class gil_scoped_release { };
#endif
error_already_set
::~
error_already_set
()
{
if
(
type
)
{
if
(
m_
type
)
{
error_scope
scope
;
gil_scoped_acquire
gil
;
type
.
release
().
dec_ref
();
value
.
release
().
dec_ref
();
trace
.
release
().
dec_ref
();
m_
type
.
release
().
dec_ref
();
m_
value
.
release
().
dec_ref
();
m_
trace
.
release
().
dec_ref
();
}
}
...
...
include/pybind11/pytypes.h
View file @
35045eee
...
...
@@ -324,7 +324,7 @@ public:
/// Constructs a new exception from the current Python error indicator, if any. The current
/// Python error indicator will be cleared.
error_already_set
()
:
std
::
runtime_error
(
detail
::
error_string
())
{
PyErr_Fetch
(
&
type
.
ptr
(),
&
value
.
ptr
(),
&
trace
.
ptr
());
PyErr_Fetch
(
&
m_
type
.
ptr
(),
&
m_
value
.
ptr
(),
&
m_
trace
.
ptr
());
}
error_already_set
(
const
error_already_set
&
)
=
default
;
...
...
@@ -335,7 +335,7 @@ public:
/// Give the currently-held error back to Python, if any. If there is currently a Python error
/// already set it is cleared first. After this call, the current object no longer stores the
/// error variables (but the `.what()` string is still available).
void
restore
()
{
PyErr_Restore
(
type
.
release
().
ptr
(),
value
.
release
().
ptr
(),
trace
.
release
().
ptr
());
}
void
restore
()
{
PyErr_Restore
(
m_
type
.
release
().
ptr
(),
m_
value
.
release
().
ptr
(),
m_
trace
.
release
().
ptr
());
}
// Does nothing; provided for backwards compatibility.
PYBIND11_DEPRECATED
(
"Use of error_already_set.clear() is deprecated"
)
...
...
@@ -344,10 +344,14 @@ public:
/// Check if the currently trapped error type matches the given Python exception class (or a
/// subclass thereof). May also be passed a tuple to search for any exception class matches in
/// the given tuple.
bool
matches
(
handle
ex
)
const
{
return
PyErr_GivenExceptionMatches
(
ex
.
ptr
(),
type
.
ptr
());
}
bool
matches
(
handle
ex
)
const
{
return
PyErr_GivenExceptionMatches
(
ex
.
ptr
(),
m_type
.
ptr
());
}
const
object
&
type
()
const
{
return
m_type
;
}
const
object
&
value
()
const
{
return
m_value
;
}
const
object
&
trace
()
const
{
return
m_trace
;
}
private:
object
type
,
value
,
trace
;
object
m_
type
,
m_
value
,
m_
trace
;
};
/** \defgroup python_builtins _
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment