Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
ac14abe9
Commit
ac14abe9
authored
Nov 23, 2013
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
back out the last two exception raising changes
parent
91bbd1ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
11 deletions
+20
-11
Cython/Utility/Exceptions.c
Cython/Utility/Exceptions.c
+20
-11
No files found.
Cython/Utility/Exceptions.c
View file @
ac14abe9
...
...
@@ -135,7 +135,7 @@ raise_error:
#else
/* Python 3+ */
static
void
__Pyx_Raise
(
PyObject
*
type
,
PyObject
*
value
,
PyObject
*
tb
,
PyObject
*
cause
)
{
PyObject
*
owned_type
=
NULL
,
*
owned_value
=
NULL
,
*
owned_tb
=
NULL
;
PyObject
*
owned_instance
=
NULL
;
if
(
tb
==
Py_None
)
{
tb
=
0
;
}
else
if
(
tb
&&
!
PyTraceBack_Check
(
tb
))
{
...
...
@@ -143,9 +143,11 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
"raise: arg 3 must be a traceback or None"
);
goto
bad
;
}
if
(
value
==
Py_None
)
value
=
0
;
if
(
PyExceptionInstance_Check
(
type
))
{
if
(
value
&&
value
!=
Py_None
)
{
if
(
value
)
{
PyErr_SetString
(
PyExc_TypeError
,
"instance exception may not have a separate value"
);
goto
bad
;
...
...
@@ -154,11 +156,21 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
type
=
(
PyObject
*
)
Py_TYPE
(
value
);
}
else
if
(
PyExceptionClass_Check
(
type
))
{
// instantiate the type now (we don't know when and how it will be caught)
PyErr_NormalizeException
(
&
type
,
&
value
,
&
owned_tb
);
if
(
!
tb
&&
owned_tb
)
tb
=
owned_tb
;
owned_type
=
type
;
owned_value
=
value
;
PyObject
*
args
;
if
(
!
value
)
args
=
PyTuple_New
(
0
);
else
if
(
PyTuple_Check
(
value
))
{
Py_INCREF
(
value
);
args
=
value
;
}
else
args
=
PyTuple_Pack
(
1
,
value
);
if
(
!
args
)
goto
bad
;
owned_instance
=
PyEval_CallObject
(
type
,
args
);
Py_DECREF
(
args
);
if
(
!
owned_instance
)
goto
bad
;
value
=
owned_instance
;
if
(
!
PyExceptionInstance_Check
(
value
))
{
PyErr_Format
(
PyExc_TypeError
,
"calling %R should have returned an instance of "
...
...
@@ -210,10 +222,7 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
}
bad:
Py_XDECREF
(
owned_type
);
Py_XDECREF
(
owned_value
);
Py_XDECREF
(
owned_tb
);
Py_XDECREF
(
owned_instance
);
return
;
}
#endif
...
...
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