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
30e2346d
Commit
30e2346d
authored
May 03, 2018
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make cpdef methods overridable in Python classes with slots (which do not have a dict).
Closes #1771.
parent
616ad557
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
1 deletion
+40
-1
CHANGES.rst
CHANGES.rst
+4
-0
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+3
-1
tests/run/cpdef_method_override.pyx
tests/run/cpdef_method_override.pyx
+33
-0
No files found.
CHANGES.rst
View file @
30e2346d
...
@@ -28,6 +28,10 @@ Bugs fixed
...
@@ -28,6 +28,10 @@ Bugs fixed
* The directive ``language_level=3`` did not apply to the first token in the
* The directive ``language_level=3`` did not apply to the first token in the
source file. (Github issue #2230)
source file. (Github issue #2230)
* Overriding cpdef methods did not work in Python subclasses with slots.
Note that this can have a performance impact on calls from Cython code.
(Github issue #1771)
Other changes
Other changes
-------------
-------------
...
...
Cython/Compiler/Nodes.py
View file @
30e2346d
...
@@ -4338,7 +4338,9 @@ class OverrideCheckNode(StatNode):
...
@@ -4338,7 +4338,9 @@ class OverrideCheckNode(StatNode):
if
self
.
py_func
.
is_module_scope
:
if
self
.
py_func
.
is_module_scope
:
code
.
putln
(
"else {"
)
code
.
putln
(
"else {"
)
else
:
else
:
code
.
putln
(
"else if (unlikely(Py_TYPE(%s)->tp_dictoffset != 0)) {"
%
self_arg
)
code
.
putln
(
"else if (unlikely((Py_TYPE(%s)->tp_dictoffset != 0)"
" || (Py_TYPE(%s)->tp_flags & (Py_TPFLAGS_IS_ABSTRACT | Py_TPFLAGS_HEAPTYPE)))) {"
%
(
self_arg
,
self_arg
))
func_node_temp
=
code
.
funcstate
.
allocate_temp
(
py_object_type
,
manage_ref
=
True
)
func_node_temp
=
code
.
funcstate
.
allocate_temp
(
py_object_type
,
manage_ref
=
True
)
self
.
func_node
.
set_cname
(
func_node_temp
)
self
.
func_node
.
set_cname
(
func_node_temp
)
# need to get attribute manually--scope would return cdef method
# need to get attribute manually--scope would return cdef method
...
...
tests/run/cpdef_method_override.pyx
0 → 100644
View file @
30e2346d
# mode: run
# tag: cpdef
# ticket: gh-1771
cdef
class
BaseType
:
"""
>>> BaseType().callmeth()
BaseType.meth
"""
def
callmeth
(
self
):
return
self
.
meth
()
cpdef
meth
(
self
):
print
(
"BaseType.meth"
)
class
PyClass
(
BaseType
):
"""
>>> PyClass().callmeth()
PyClass.meth
"""
def
meth
(
self
):
print
(
"PyClass.meth"
)
class
PySlotsClass
(
BaseType
):
"""
>>> PySlotsClass().callmeth()
PySlotsClass.meth
"""
__slots__
=
[]
def
meth
(
self
):
print
(
"PySlotsClass.meth"
)
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