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
f10a0a39
Commit
f10a0a39
authored
May 31, 2019
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile errors in CPython 3.8b1 due to the tp_print/tp_vectorcall slots.
Closes GH-2976.
parent
bfe60761
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
0 deletions
+44
-0
CHANGES.rst
CHANGES.rst
+10
-0
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+3
-0
Cython/Compiler/TypeSlots.py
Cython/Compiler/TypeSlots.py
+1
-0
Cython/Utility/AsyncGen.c
Cython/Utility/AsyncGen.c
+12
-0
Cython/Utility/Coroutine.c
Cython/Utility/Coroutine.c
+12
-0
Cython/Utility/CythonFunction.c
Cython/Utility/CythonFunction.c
+6
-0
No files found.
CHANGES.rst
View file @
f10a0a39
...
@@ -2,6 +2,16 @@
...
@@ -2,6 +2,16 @@
Cython
Changelog
Cython
Changelog
================
================
0.29.10
(
2019
-
06
-
0
?)
====================
Bugs
fixed
----------
*
Fix
compile
errors
in
CPython
3.8
b1
due
to
the
new
"tp_vectorcall"
slots
.
(
Github
issue
#
2976
)
0.29.9
(
2019
-
05
-
29
)
0.29.9
(
2019
-
05
-
29
)
===================
===================
...
...
Cython/Compiler/Nodes.py
View file @
f10a0a39
...
@@ -4898,7 +4898,10 @@ class CClassDefNode(ClassDefNode):
...
@@ -4898,7 +4898,10 @@ class CClassDefNode(ClassDefNode):
code
.
error_goto
(
entry
.
pos
)))
code
.
error_goto
(
entry
.
pos
)))
# Don't inherit tp_print from builtin types, restoring the
# Don't inherit tp_print from builtin types, restoring the
# behavior of using tp_repr or tp_str instead.
# behavior of using tp_repr or tp_str instead.
# ("tp_print" was renamed to "tp_vectorcall_offset" in Py3.8b1)
code
.
putln
(
"#if PY_VERSION_HEX < 0x030800B1"
)
code
.
putln
(
"%s.tp_print = 0;"
%
typeobj_cname
)
code
.
putln
(
"%s.tp_print = 0;"
%
typeobj_cname
)
code
.
putln
(
"#endif"
)
# Use specialised attribute lookup for types with generic lookup but no instance dict.
# Use specialised attribute lookup for types with generic lookup but no instance dict.
getattr_slot_func
=
TypeSlots
.
get_slot_code_by_name
(
scope
,
'tp_getattro'
)
getattr_slot_func
=
TypeSlots
.
get_slot_code_by_name
(
scope
,
'tp_getattro'
)
...
...
Cython/Compiler/TypeSlots.py
View file @
f10a0a39
...
@@ -887,6 +887,7 @@ slot_table = (
...
@@ -887,6 +887,7 @@ slot_table = (
EmptySlot
(
"tp_del"
),
EmptySlot
(
"tp_del"
),
EmptySlot
(
"tp_version_tag"
),
EmptySlot
(
"tp_version_tag"
),
EmptySlot
(
"tp_finalize"
,
ifdef
=
"PY_VERSION_HEX >= 0x030400a1"
),
EmptySlot
(
"tp_finalize"
,
ifdef
=
"PY_VERSION_HEX >= 0x030400a1"
),
EmptySlot
(
"tp_vectorcall"
,
ifdef
=
"PY_VERSION_HEX >= 0x030800b1"
),
)
)
#------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------
...
...
Cython/Utility/AsyncGen.c
View file @
f10a0a39
...
@@ -421,6 +421,9 @@ static PyTypeObject __pyx_AsyncGenType_type = {
...
@@ -421,6 +421,9 @@ static PyTypeObject __pyx_AsyncGenType_type = {
#elif PY_VERSION_HEX >= 0x030400a1
#elif PY_VERSION_HEX >= 0x030400a1
0
,
/* tp_finalize */
0
,
/* tp_finalize */
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
@@ -650,6 +653,9 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = {
...
@@ -650,6 +653,9 @@ static PyTypeObject __pyx__PyAsyncGenASendType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/* tp_finalize */
0
,
/* tp_finalize */
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
@@ -759,6 +765,9 @@ static PyTypeObject __pyx__PyAsyncGenWrappedValueType_type = {
...
@@ -759,6 +765,9 @@ static PyTypeObject __pyx__PyAsyncGenWrappedValueType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/* tp_finalize */
0
,
/* tp_finalize */
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
@@ -1038,6 +1047,9 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = {
...
@@ -1038,6 +1047,9 @@ static PyTypeObject __pyx__PyAsyncGenAThrowType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/* tp_finalize */
0
,
/* tp_finalize */
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
...
Cython/Utility/Coroutine.c
View file @
f10a0a39
...
@@ -1497,6 +1497,9 @@ static PyTypeObject __pyx_CoroutineAwaitType_type = {
...
@@ -1497,6 +1497,9 @@ static PyTypeObject __pyx_CoroutineAwaitType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/*tp_finalize*/
0
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
#if PY_VERSION_HEX < 0x030500B1 || defined(__Pyx_IterableCoroutine_USED) || CYTHON_USE_ASYNC_SLOTS
#if PY_VERSION_HEX < 0x030500B1 || defined(__Pyx_IterableCoroutine_USED) || CYTHON_USE_ASYNC_SLOTS
...
@@ -1655,6 +1658,9 @@ static PyTypeObject __pyx_CoroutineType_type = {
...
@@ -1655,6 +1658,9 @@ static PyTypeObject __pyx_CoroutineType_type = {
#elif PY_VERSION_HEX >= 0x030400a1
#elif PY_VERSION_HEX >= 0x030400a1
0
,
/*tp_finalize*/
0
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
static
int
__pyx_Coroutine_init
(
void
)
{
static
int
__pyx_Coroutine_init
(
void
)
{
...
@@ -1760,6 +1766,9 @@ static PyTypeObject __pyx_IterableCoroutineType_type = {
...
@@ -1760,6 +1766,9 @@ static PyTypeObject __pyx_IterableCoroutineType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
__Pyx_Coroutine_del
,
/*tp_finalize*/
__Pyx_Coroutine_del
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
@@ -1860,6 +1869,9 @@ static PyTypeObject __pyx_GeneratorType_type = {
...
@@ -1860,6 +1869,9 @@ static PyTypeObject __pyx_GeneratorType_type = {
#elif PY_VERSION_HEX >= 0x030400a1
#elif PY_VERSION_HEX >= 0x030400a1
0
,
/*tp_finalize*/
0
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
static
int
__pyx_Generator_init
(
void
)
{
static
int
__pyx_Generator_init
(
void
)
{
...
...
Cython/Utility/CythonFunction.c
View file @
f10a0a39
...
@@ -730,6 +730,9 @@ static PyTypeObject __pyx_CyFunctionType_type = {
...
@@ -730,6 +730,9 @@ static PyTypeObject __pyx_CyFunctionType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/*tp_finalize*/
0
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
...
@@ -1203,6 +1206,9 @@ static PyTypeObject __pyx_FusedFunctionType_type = {
...
@@ -1203,6 +1206,9 @@ static PyTypeObject __pyx_FusedFunctionType_type = {
#if PY_VERSION_HEX >= 0x030400a1
#if PY_VERSION_HEX >= 0x030400a1
0
,
/*tp_finalize*/
0
,
/*tp_finalize*/
#endif
#endif
#if PY_VERSION_HEX >= 0x030800b1
0
,
/*tp_vectorcall*/
#endif
};
};
static
int
__pyx_FusedFunction_init
(
void
)
{
static
int
__pyx_FusedFunction_init
(
void
)
{
...
...
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