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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
0b4663f4
Commit
0b4663f4
authored
Jul 08, 2018
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0.28.x'
parents
4986fbec
9e74fb6c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Cython/Utility/Coroutine.c
Cython/Utility/Coroutine.c
+1
-1
Cython/Utility/Exceptions.c
Cython/Utility/Exceptions.c
+5
-5
No files found.
Cython/Utility/Coroutine.c
View file @
0b4663f4
...
@@ -1858,7 +1858,7 @@ static void __Pyx__ReturnWithStopIteration(PyObject* value) {
...
@@ -1858,7 +1858,7 @@ static void __Pyx__ReturnWithStopIteration(PyObject* value) {
}
}
#if CYTHON_FAST_THREAD_STATE
#if CYTHON_FAST_THREAD_STATE
__Pyx_PyThreadState_assign
__Pyx_PyThreadState_assign
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
if
(
!
$
local_tstate_cname
->
exc_state
.
exc_type
)
if
(
!
$
local_tstate_cname
->
exc_state
.
exc_type
)
#else
#else
if
(
!
$
local_tstate_cname
->
exc_type
)
if
(
!
$
local_tstate_cname
->
exc_type
)
...
...
Cython/Utility/Exceptions.c
View file @
0b4663f4
...
@@ -360,7 +360,7 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
...
@@ -360,7 +360,7 @@ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb)
*
value
=
local_value
;
*
value
=
local_value
;
*
tb
=
local_tb
;
*
tb
=
local_tb
;
#if CYTHON_FAST_THREAD_STATE
#if CYTHON_FAST_THREAD_STATE
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
...
@@ -404,7 +404,7 @@ static CYTHON_INLINE void __Pyx_ReraiseException(void) {
...
@@ -404,7 +404,7 @@ static CYTHON_INLINE void __Pyx_ReraiseException(void) {
PyObject
*
type
=
NULL
,
*
value
=
NULL
,
*
tb
=
NULL
;
PyObject
*
type
=
NULL
,
*
value
=
NULL
,
*
tb
=
NULL
;
#if CYTHON_FAST_THREAD_STATE
#if CYTHON_FAST_THREAD_STATE
PyThreadState
*
tstate
=
PyThreadState_GET
();
PyThreadState
*
tstate
=
PyThreadState_GET
();
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
type
=
tstate
->
exc_state
.
exc_type
;
type
=
tstate
->
exc_state
.
exc_type
;
value
=
tstate
->
exc_state
.
exc_value
;
value
=
tstate
->
exc_state
.
exc_value
;
tb
=
tstate
->
exc_state
.
exc_traceback
;
tb
=
tstate
->
exc_state
.
exc_traceback
;
...
@@ -456,7 +456,7 @@ static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject
...
@@ -456,7 +456,7 @@ static CYTHON_INLINE void __Pyx__ExceptionReset(PyThreadState *tstate, PyObject
#if CYTHON_FAST_THREAD_STATE
#if CYTHON_FAST_THREAD_STATE
static
CYTHON_INLINE
void
__Pyx__ExceptionSave
(
PyThreadState
*
tstate
,
PyObject
**
type
,
PyObject
**
value
,
PyObject
**
tb
)
{
static
CYTHON_INLINE
void
__Pyx__ExceptionSave
(
PyThreadState
*
tstate
,
PyObject
**
type
,
PyObject
**
value
,
PyObject
**
tb
)
{
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
*
type
=
tstate
->
exc_state
.
exc_type
;
*
type
=
tstate
->
exc_state
.
exc_type
;
*
value
=
tstate
->
exc_state
.
exc_value
;
*
value
=
tstate
->
exc_state
.
exc_value
;
*
tb
=
tstate
->
exc_state
.
exc_traceback
;
*
tb
=
tstate
->
exc_state
.
exc_traceback
;
...
@@ -473,7 +473,7 @@ static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject *
...
@@ -473,7 +473,7 @@ static CYTHON_INLINE void __Pyx__ExceptionSave(PyThreadState *tstate, PyObject *
static
CYTHON_INLINE
void
__Pyx__ExceptionReset
(
PyThreadState
*
tstate
,
PyObject
*
type
,
PyObject
*
value
,
PyObject
*
tb
)
{
static
CYTHON_INLINE
void
__Pyx__ExceptionReset
(
PyThreadState
*
tstate
,
PyObject
*
type
,
PyObject
*
value
,
PyObject
*
tb
)
{
PyObject
*
tmp_type
,
*
tmp_value
,
*
tmp_tb
;
PyObject
*
tmp_type
,
*
tmp_value
,
*
tmp_tb
;
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
...
@@ -511,7 +511,7 @@ static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value,
...
@@ -511,7 +511,7 @@ static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value,
static
CYTHON_INLINE
void
__Pyx__ExceptionSwap
(
PyThreadState
*
tstate
,
PyObject
**
type
,
PyObject
**
value
,
PyObject
**
tb
)
{
static
CYTHON_INLINE
void
__Pyx__ExceptionSwap
(
PyThreadState
*
tstate
,
PyObject
**
type
,
PyObject
**
value
,
PyObject
**
tb
)
{
PyObject
*
tmp_type
,
*
tmp_value
,
*
tmp_tb
;
PyObject
*
tmp_type
,
*
tmp_value
,
*
tmp_tb
;
#if PY_VERSION_HEX >= 0x030700A
2
#if PY_VERSION_HEX >= 0x030700A
3
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_type
=
tstate
->
exc_state
.
exc_type
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_value
=
tstate
->
exc_state
.
exc_value
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
tmp_tb
=
tstate
->
exc_state
.
exc_traceback
;
...
...
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