Commit 0e061044 authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 05808083 55445737
...@@ -7499,12 +7499,12 @@ PyObject *%(binding_cfunc)s_NewEx(PyMethodDef *ml, PyObject *self, PyObject *mod ...@@ -7499,12 +7499,12 @@ PyObject *%(binding_cfunc)s_NewEx(PyMethodDef *ml, PyObject *self, PyObject *mod
op->func.m_self = self; op->func.m_self = self;
Py_XINCREF(module); Py_XINCREF(module);
op->func.m_module = module; op->func.m_module = module;
_PyObject_GC_TRACK(op); PyObject_GC_Track(op);
return (PyObject *)op; return (PyObject *)op;
} }
static void %(binding_cfunc)s_dealloc(%(binding_cfunc)s_object *m) { static void %(binding_cfunc)s_dealloc(%(binding_cfunc)s_object *m) {
_PyObject_GC_UNTRACK(m); PyObject_GC_UnTrack(m);
Py_XDECREF(m->func.m_self); Py_XDECREF(m->func.m_self);
Py_XDECREF(m->func.m_module); Py_XDECREF(m->func.m_module);
PyObject_GC_Del(m); PyObject_GC_Del(m);
......
...@@ -571,6 +571,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -571,6 +571,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#endif #endif
#if PY_MAJOR_VERSION >= 3
#define PyBoolObject PyLongObject
#endif
""") """)
code.put(""" code.put("""
...@@ -932,8 +937,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -932,8 +937,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
self.generate_getitem_int_function(scope, code) self.generate_getitem_int_function(scope, code)
if scope.defines_any(["__setitem__", "__delitem__"]): if scope.defines_any(["__setitem__", "__delitem__"]):
self.generate_ass_subscript_function(scope, code) self.generate_ass_subscript_function(scope, code)
if scope.defines_any(["__getslice__", "__setslice__", "__delslice__"]):
warning(self.pos, "__getslice__, __setslice__, and __delslice__ are not supported by Python 3, use __getitem__, __setitem__, and __delitem__ instead", 1)
code.putln("#if PY_MAJOR_VERSION >= 3")
code.putln("#error __getslice__, __setslice__, and __delslice__ not supported in Python 3.")
code.putln("#endif")
if scope.defines_any(["__setslice__", "__delslice__"]): if scope.defines_any(["__setslice__", "__delslice__"]):
warning(self.pos, "__setslice__ and __delslice__ are not supported by Python 3, use __setitem__ and __getitem__ instead", 1)
self.generate_ass_slice_function(scope, code) self.generate_ass_slice_function(scope, code)
if scope.defines_any(["__getattr__","__getattribute__"]): if scope.defines_any(["__getattr__","__getattribute__"]):
self.generate_getattro_function(scope, code) self.generate_getattro_function(scope, code)
...@@ -1260,9 +1269,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1260,9 +1269,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
# Setting and deleting a slice are both done through # Setting and deleting a slice are both done through
# the ass_slice method, so we dispatch to user's __setslice__ # the ass_slice method, so we dispatch to user's __setslice__
# or __delslice__, or raise an exception. # or __delslice__, or raise an exception.
code.putln("#if PY_MAJOR_VERSION >= 3")
code.putln("#error __setslice__ and __delslice__ not supported in Python 3.")
code.putln("#endif")
base_type = scope.parent_type.base_type base_type = scope.parent_type.base_type
set_entry = scope.lookup_here("__setslice__") set_entry = scope.lookup_here("__setslice__")
del_entry = scope.lookup_here("__delslice__") del_entry = scope.lookup_here("__delslice__")
...@@ -2035,6 +2041,29 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -2035,6 +2041,29 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
"if (PyType_Ready(&%s) < 0) %s" % ( "if (PyType_Ready(&%s) < 0) %s" % (
typeobj_cname, typeobj_cname,
code.error_goto(entry.pos))) code.error_goto(entry.pos)))
# Fix special method docstrings. This is a bit of a hack, but
# unless we let PyType_Ready create the slot wrappers we have
# a significant performance hit. (See trac #561.)
for func in entry.type.scope.pyfunc_entries:
if func.is_special and func.wrapperbase_cname:
code.putln("{");
code.putln(
'PyObject *wrapper = PyObject_GetAttrString((PyObject *)&%s, "%s"); %s' % (
typeobj_cname,
func.name,
code.error_goto_if_null('wrapper', entry.pos)));
code.putln(
"if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {");
code.putln(
"%s = *((PyWrapperDescrObject *)wrapper)->d_base;" % (
func.wrapperbase_cname));
code.putln(
"%s.doc = %s;" % (func.wrapperbase_cname, func.doc_cname));
code.putln(
"((PyWrapperDescrObject *)wrapper)->d_base = &%s;" % (
func.wrapperbase_cname));
code.putln("}");
code.putln("}");
if type.vtable_cname: if type.vtable_cname:
code.putln( code.putln(
"if (__Pyx_SetVtable(%s.tp_dict, %s) < 0) %s" % ( "if (__Pyx_SetVtable(%s.tp_dict, %s) < 0) %s" % (
......
...@@ -35,6 +35,7 @@ prop_set_prefix = pyrex_prefix + "setprop_" ...@@ -35,6 +35,7 @@ prop_set_prefix = pyrex_prefix + "setprop_"
type_prefix = pyrex_prefix + "t_" type_prefix = pyrex_prefix + "t_"
typeobj_prefix = pyrex_prefix + "type_" typeobj_prefix = pyrex_prefix + "type_"
var_prefix = pyrex_prefix + "v_" var_prefix = pyrex_prefix + "v_"
wrapperbase_prefix= pyrex_prefix + "wrapperbase_"
bufstruct_prefix = pyrex_prefix + "bstruct_" bufstruct_prefix = pyrex_prefix + "bstruct_"
bufstride_prefix = pyrex_prefix + "bstride_" bufstride_prefix = pyrex_prefix + "bstride_"
bufshape_prefix = pyrex_prefix + "bshape_" bufshape_prefix = pyrex_prefix + "bshape_"
......
...@@ -2110,6 +2110,11 @@ class DefNode(FuncDefNode): ...@@ -2110,6 +2110,11 @@ class DefNode(FuncDefNode):
entry.doc = embed_position(self.pos, self.doc) entry.doc = embed_position(self.pos, self.doc)
entry.doc_cname = \ entry.doc_cname = \
Naming.funcdoc_prefix + prefix + name Naming.funcdoc_prefix + prefix + name
if entry.is_special:
if entry.name in TypeSlots.invisible or not entry.doc:
entry.wrapperbase_cname = None
else:
entry.wrapperbase_cname = Naming.wrapperbase_prefix + prefix + name
else: else:
entry.doc = None entry.doc = None
...@@ -2224,10 +2229,8 @@ class DefNode(FuncDefNode): ...@@ -2224,10 +2229,8 @@ class DefNode(FuncDefNode):
if proto_only: if proto_only:
return return
if (Options.docstrings and self.entry.doc and if (Options.docstrings and self.entry.doc and
(not self.entry.is_special or not self.entry.scope.is_property_scope and
self.entry.signature.method_flags()) and (not self.entry.is_special or self.entry.wrapperbase_cname)):
not self.entry.scope.is_property_scope
):
docstr = self.entry.doc docstr = self.entry.doc
if docstr.is_unicode: if docstr.is_unicode:
docstr = docstr.utf8encode() docstr = docstr.utf8encode()
...@@ -2235,6 +2238,9 @@ class DefNode(FuncDefNode): ...@@ -2235,6 +2238,9 @@ class DefNode(FuncDefNode):
'static char %s[] = "%s";' % ( 'static char %s[] = "%s";' % (
self.entry.doc_cname, self.entry.doc_cname,
split_string_literal(escape_byte_string(docstr)))) split_string_literal(escape_byte_string(docstr))))
if self.entry.is_special:
code.putln(
"struct wrapperbase %s;" % self.entry.wrapperbase_cname)
if with_pymethdef: if with_pymethdef:
code.put( code.put(
"static PyMethodDef %s = " % "static PyMethodDef %s = " %
......
...@@ -8,6 +8,9 @@ import PyrexTypes ...@@ -8,6 +8,9 @@ import PyrexTypes
import StringEncoding import StringEncoding
import sys import sys
invisible = ['__cinit__', '__dealloc__', '__richcmp__',
'__nonzero__', '__bool__']
class Signature(object): class Signature(object):
# Method slot signature descriptor. # Method slot signature descriptor.
# #
......
version = '0.13.beta0' version = '0.13.beta1'
...@@ -59,9 +59,15 @@ VER_DEP_MODULES = { ...@@ -59,9 +59,15 @@ VER_DEP_MODULES = {
(2,6) : (operator.lt, lambda x: x in ['run.print_function', (2,6) : (operator.lt, lambda x: x in ['run.print_function',
'run.cython3', 'run.cython3',
]), ]),
# The next line should start (3,); but this is a dictionary, so
# we can only have one (3,) key. Since 2.7 is supposed to be the
# last 2.x release, things would have to change drastically for this
# to be unsafe...
(2,999): (operator.lt, lambda x: x in ['run.special_methods_T561_py3']),
(3,): (operator.ge, lambda x: x in ['run.non_future_division', (3,): (operator.ge, lambda x: x in ['run.non_future_division',
'compile.extsetslice', 'compile.extsetslice',
'compile.extdelslice']), 'compile.extdelslice',
'run.special_methods_T561_py2']),
} }
INCLUDE_DIRS = [ d for d in os.getenv('INCLUDE', '').split(os.pathsep) if d ] INCLUDE_DIRS = [ d for d in os.getenv('INCLUDE', '').split(os.pathsep) if d ]
......
...@@ -83,9 +83,9 @@ def return_range_sum_squares(int N): ...@@ -83,9 +83,9 @@ def return_range_sum_squares(int N):
>>> return_range_sum_squares(10) >>> return_range_sum_squares(10)
285 285
>>> sum([i*i for i in range(10000)]) >>> print(sum([i*i for i in range(10000)]))
333283335000 333283335000
>>> return_range_sum_squares(10000) >>> print(return_range_sum_squares(10000))
333283335000 333283335000
""" """
return sum(i*i for i in range(N)) return sum(i*i for i in range(N))
...@@ -101,9 +101,9 @@ def return_sum_squares(seq): ...@@ -101,9 +101,9 @@ def return_sum_squares(seq):
>>> return_sum_squares(range(10)) >>> return_sum_squares(range(10))
285 285
>>> sum([i*i for i in range(10000)]) >>> print(sum([i*i for i in range(10000)]))
333283335000 333283335000
>>> return_sum_squares(range(10000)) >>> print(return_sum_squares(range(10000)))
333283335000 333283335000
""" """
return sum(i*i for i in seq) return sum(i*i for i in seq)
...@@ -119,9 +119,9 @@ def return_sum_squares_start(seq, int start): ...@@ -119,9 +119,9 @@ def return_sum_squares_start(seq, int start):
>>> return_sum_squares_start(range(10), -1) >>> return_sum_squares_start(range(10), -1)
284 284
>>> sum([i*i for i in range(10000)], 9) >>> print(sum([i*i for i in range(10000)], 9))
333283335009 333283335009
>>> return_sum_squares_start(range(10000), 9) >>> print(return_sum_squares_start(range(10000), 9))
333283335009 333283335009
""" """
return sum((i*i for i in seq), start) return sum((i*i for i in seq), start)
...@@ -140,9 +140,9 @@ def return_typed_sum_squares_start(seq, int start): ...@@ -140,9 +140,9 @@ def return_typed_sum_squares_start(seq, int start):
>>> return_typed_sum_squares_start(range(10), -1) >>> return_typed_sum_squares_start(range(10), -1)
284 284
>>> sum([i*i for i in range(1000)], 9) >>> print(sum([i*i for i in range(1000)], 9))
332833509 332833509
>>> return_typed_sum_squares_start(range(1000), 9) >>> print(return_typed_sum_squares_start(range(1000), 9))
332833509 332833509
""" """
cdef int i cdef int i
......
cdef class A:
"""
>>> A.__init__.__doc__
'A.__init__ docstring'
>>> A.__len__.__doc__
'A.__len__ docstring'
>>> A.__add__.__doc__
'A.__add__ docstring'
"""
def __init__(self):
"A.__init__ docstring"
def __len__(self):
"A.__len__ docstring"
def __add__(self, other):
"A.__add__ docstring"
cdef class B(A):
"""
>>> B.__init__.__doc__
'A.__init__ docstring'
>>> B.__len__.__doc__
'B.__len__ docstring'
>>> B.__add__.__doc__
'A.__add__ docstring'
"""
def __len__(self):
"B.__len__ docstring"
class C(A):
"""
>>> C.__init__.__doc__
'A.__init__ docstring'
>>> C.__len__.__doc__
'C.__len__ docstring'
>>> C.__add__.__doc__
'A.__add__ docstring'
"""
def __len__(self):
"C.__len__ docstring"
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
# To test this, we go through and verify that each affected special # To test this, we go through and verify that each affected special
# method works as a bound method. # method works as a bound method.
# Special methods that are treated the same under Python 2 and 3 are
# tested here; see also special_methods_T561_py2.pyx and
# special_methods_T561_py3.pyx for tests of the differences between
# Python 2 and 3.
__doc__ = u""" __doc__ = u"""
>>> vs0 = VerySpecial(0) >>> vs0 = VerySpecial(0)
VS __init__ 0 VS __init__ 0
...@@ -20,9 +25,6 @@ __doc__ = u""" ...@@ -20,9 +25,6 @@ __doc__ = u"""
>>> vs0_mul = vs0.__mul__ >>> vs0_mul = vs0.__mul__
>>> vs0_mul(vs1) >>> vs0_mul(vs1)
VS __mul__ 0 1 VS __mul__ 0 1
>>> vs0_div = vs0.__div__
>>> vs0_div(vs1)
VS __div__ 0 1
>>> vs0_mod = vs0.__mod__ >>> vs0_mod = vs0.__mod__
>>> vs0_mod(vs1) >>> vs0_mod(vs1)
VS __mod__ 0 1 VS __mod__ 0 1
...@@ -43,10 +45,6 @@ __doc__ = u""" ...@@ -43,10 +45,6 @@ __doc__ = u"""
>>> vs0_abs = vs0.__abs__ >>> vs0_abs = vs0.__abs__
>>> vs0_abs() >>> vs0_abs()
VS __abs__ 0 VS __abs__ 0
>>> vs0_nonzero = vs0.__nonzero__
>>> vs0_nonzero()
VS __nonzero__ 0
False
>>> vs0_invert = vs0.__invert__ >>> vs0_invert = vs0.__invert__
>>> vs0_invert() >>> vs0_invert()
VS __invert__ 0 VS __invert__ 0
...@@ -68,18 +66,9 @@ __doc__ = u""" ...@@ -68,18 +66,9 @@ __doc__ = u"""
>>> vs0_int = vs0.__int__ >>> vs0_int = vs0.__int__
>>> vs0_int() >>> vs0_int()
VS __int__ 0 VS __int__ 0
>>> vs0_long = vs0.__long__
>>> vs0_long()
VS __long__ 0
>>> vs0_float = vs0.__float__ >>> vs0_float = vs0.__float__
>>> vs0_float() >>> vs0_float()
VS __float__ 0 VS __float__ 0
>>> vs0_oct = vs0.__oct__
>>> vs0_oct()
VS __oct__ 0
>>> vs0_hex = vs0.__hex__
>>> vs0_hex()
VS __hex__ 0
>>> vs0_iadd = vs0.__iadd__ >>> vs0_iadd = vs0.__iadd__
>>> vs0_iadd(vs1) >>> vs0_iadd(vs1)
VS __iadd__ 0 += 1 VS __iadd__ 0 += 1
...@@ -89,9 +78,6 @@ __doc__ = u""" ...@@ -89,9 +78,6 @@ __doc__ = u"""
>>> vs0_imul = vs0.__imul__ >>> vs0_imul = vs0.__imul__
>>> vs0_imul(vs1) >>> vs0_imul(vs1)
VS __imul__ 0 *= 1 VS __imul__ 0 *= 1
>>> vs0_idiv = vs0.__idiv__
>>> vs0_idiv(vs1)
VS __idiv__ 0 /= 1
>>> vs0_imod = vs0.__imod__ >>> vs0_imod = vs0.__imod__
>>> vs0_imod(vs1) >>> vs0_imod(vs1)
VS __imod__ 0 %= 1 VS __imod__ 0 %= 1
...@@ -136,9 +122,6 @@ __doc__ = u""" ...@@ -136,9 +122,6 @@ __doc__ = u"""
>>> vs0_rmul = vs0.__rmul__ >>> vs0_rmul = vs0.__rmul__
>>> vs0_rmul(vs1) >>> vs0_rmul(vs1)
VS __mul__ 1 0 VS __mul__ 1 0
>>> vs0_rdiv = vs0.__rdiv__
>>> vs0_rdiv(vs1)
VS __div__ 1 0
>>> vs0_rmod = vs0.__rmod__ >>> vs0_rmod = vs0.__rmod__
>>> vs0_rmod(vs1) >>> vs0_rmod(vs1)
VS __mod__ 1 0 VS __mod__ 1 0
...@@ -175,33 +158,6 @@ __doc__ = u""" ...@@ -175,33 +158,6 @@ __doc__ = u"""
>>> vs0_getitem = vs0.__getitem__ >>> vs0_getitem = vs0.__getitem__
>>> vs0_getitem('foo') >>> vs0_getitem('foo')
VS __getitem__ 0['foo'] VS __getitem__ 0['foo']
>>> vs0_getslice = vs0.__getslice__
>>> vs0_getslice(13, 42)
VS __getslice__ 0 13 42
>>> # If you define either setslice or delslice, you get wrapper objects
>>> # for both methods. (This behavior is unchanged by #561.)
>>> ss_setslice = SetSlice().__setslice__
>>> ss_setslice(13, 42, 'foo')
SetSlice setslice 13 42 'foo'
>>> ss_delslice = SetSlice().__delslice__
>>> ss_delslice(13, 42)
Traceback (most recent call last):
...
NotImplementedError: 2-element slice deletion not supported by special_methods_T561.SetSlice
>>> ds_setslice = DelSlice().__setslice__
>>> ds_setslice(13, 42, 'foo')
Traceback (most recent call last):
...
NotImplementedError: 2-element slice assignment not supported by special_methods_T561.DelSlice
>>> ds_delslice = DelSlice().__delslice__
>>> ds_delslice(13, 42)
DelSlice delslice 13 42
>>> sds_setslice = SetDelSlice().__setslice__
>>> sds_setslice(13, 42, 'foo')
SetDelSlice setslice 13 42 'foo'
>>> sds_delslice = SetDelSlice().__delslice__
>>> sds_delslice(13, 42)
SetDelSlice delslice 13 42
>>> vs0_contains = vs0.__contains__ >>> vs0_contains = vs0.__contains__
>>> vs0_contains(vs1) >>> vs0_contains(vs1)
VS __contains__ 0 1 VS __contains__ 0 1
...@@ -234,10 +190,6 @@ __doc__ = u""" ...@@ -234,10 +190,6 @@ __doc__ = u"""
>>> sdi_delitem = SetDelItem().__delitem__ >>> sdi_delitem = SetDelItem().__delitem__
>>> sdi_delitem('foo') >>> sdi_delitem('foo')
SetDelItem delitem 'foo' SetDelItem delitem 'foo'
>>> vs0_cmp = vs0.__cmp__
>>> vs0_cmp(vs1)
VS __cmp__ 0 1
0
>>> vs0_repr = vs0.__repr__ >>> vs0_repr = vs0.__repr__
>>> vs0_repr() >>> vs0_repr()
VS __repr__ 0 VS __repr__ 0
...@@ -317,14 +269,9 @@ __doc__ = u""" ...@@ -317,14 +269,9 @@ __doc__ = u"""
>>> vs0_iter = vs0.__iter__ >>> vs0_iter = vs0.__iter__
>>> vs0_iter() >>> vs0_iter()
VS __iter__ 0 VS __iter__ 0
>>> # If you define __next__, you get both __next__ and next (this behavior
>>> # is unchanged by T561)
>>> vs0_next = vs0.__next__ >>> vs0_next = vs0.__next__
>>> vs0_next() >>> vs0_next()
VS next/__next__ 0 VS next/__next__ 0
>>> vs0_next2 = vs0.next
>>> vs0_next2()
VS next/__next__ 0
>>> vs0_get = vs0.__get__ >>> vs0_get = vs0.__get__
>>> vs0_get('instance', 'owner') >>> vs0_get('instance', 'owner')
VS __get__ 0 'instance' 'owner' VS __get__ 0 'instance' 'owner'
...@@ -355,11 +302,8 @@ __doc__ = u""" ...@@ -355,11 +302,8 @@ __doc__ = u"""
>>> vs0_init = vs0.__init__ >>> vs0_init = vs0.__init__
>>> vs0_init(0) >>> vs0_init(0)
VS __init__ 0 VS __init__ 0
>>> # If you define __long__, you also get a wrapper object for __int__. >>> # If you define __long__, you get a wrapper object for __int__.
>>> # (This behavior is unchanged by #561.) >>> # (This behavior is unchanged by #561.)
>>> Ll = Long().__long__
>>> Ll()
Long __long__
>>> Li = Long().__int__ >>> Li = Long().__int__
>>> Li() >>> Li()
Long __long__ Long __long__
...@@ -491,9 +435,6 @@ cdef class VerySpecial: ...@@ -491,9 +435,6 @@ cdef class VerySpecial:
def __getitem__(self, index): def __getitem__(self, index):
print "VS __getitem__ %d[%r]" % (self.value, index) print "VS __getitem__ %d[%r]" % (self.value, index)
def __getslice__(self, a, b):
print "VS __getslice__ %d %d %d" % (self.value, a, b)
def __contains__(self, other): def __contains__(self, other):
print "VS __contains__ %d %d" % (self.value, other.value) print "VS __contains__ %d %d" % (self.value, other.value)
...@@ -528,21 +469,6 @@ cdef class VerySpecial: ...@@ -528,21 +469,6 @@ cdef class VerySpecial:
def __get__(self, inst, own): def __get__(self, inst, own):
print "VS __get__ %d %r %r" % (self.value, inst, own) print "VS __get__ %d %r %r" % (self.value, inst, own)
cdef class SetSlice:
def __setslice__(self, a, b, value):
print "SetSlice setslice %d %d %r" % (a, b, value)
cdef class DelSlice:
def __delslice__(self, a, b):
print "DelSlice delslice %d %d" % (a, b)
cdef class SetDelSlice:
def __setslice__(self, a, b, value):
print "SetDelSlice setslice %d %d %r" % (a, b, value)
def __delslice__(self, a, b):
print "SetDelSlice delslice %d %d" % (a, b)
cdef class SetItem: cdef class SetItem:
def __setitem__(self, index, value): def __setitem__(self, index, value):
print "SetItem setitem %r %r" % (index, value) print "SetItem setitem %r %r" % (index, value)
......
# This file tests the behavior of special methods under Python 2
# after #561. (Only methods whose behavior differs between Python 2 and 3
# are tested here; see special_methods_T561.pyx for the rest of the tests.)
__doc__ = u"""
>>> vs0 = VerySpecial(0)
VS __init__ 0
>>> vs1 = VerySpecial(1)
VS __init__ 1
>>> # Python 3 does not use __cmp__.
>>> vs0_cmp = vs0.__cmp__
>>> vs0_cmp(vs1)
VS __cmp__ 0 1
0
>>> # Python 3 does not use __div__ or __idiv__.
>>> vs0_div = vs0.__div__
>>> vs0_div(vs1)
VS __div__ 0 1
>>> vs0_idiv = vs0.__idiv__
>>> vs0_idiv(vs1)
VS __idiv__ 0 /= 1
>>> vs0_rdiv = vs0.__rdiv__
>>> vs0_rdiv(vs1)
VS __div__ 1 0
>>> # Python 3 does not use __oct__ or __hex__.
>>> vs0_oct = vs0.__oct__
>>> vs0_oct()
VS __oct__ 0
>>> vs0_hex = vs0.__hex__
>>> vs0_hex()
VS __hex__ 0
>>> # Python 3 does not use __nonzero__; if you define a __nonzero__
>>> # method, Cython for Python 3 would give you a __bool__ method
>>> # instead.
>>> vs0_nonzero = vs0.__nonzero__
>>> vs0_nonzero()
VS __nonzero__ 0
False
>>> # If you define __next__, you get both __next__ and next (this behavior
>>> # is unchanged by T561, but only happens in Python 2)
>>> vs0_next = vs0.__next__
>>> vs0_next()
VS next/__next__ 0
>>> vs0_next2 = vs0.next
>>> vs0_next2()
VS next/__next__ 0
>>> # Cython supports getslice only for Python 2.
>>> vs0_getslice = vs0.__getslice__
>>> vs0_getslice(13, 42)
VS __getslice__ 0 13 42
>>> # Cython supports setslice and delslice only for Python 2.
>>> # If you define either setslice or delslice, you get wrapper objects
>>> # for both methods. (This behavior is unchanged by #561.)
>>> ss_setslice = SetSlice().__setslice__
>>> ss_setslice(13, 42, 'foo')
SetSlice setslice 13 42 'foo'
>>> ss_delslice = SetSlice().__delslice__
>>> ss_delslice(13, 42)
Traceback (most recent call last):
...
NotImplementedError: 2-element slice deletion not supported by special_methods_T561_py2.SetSlice
>>> ds_setslice = DelSlice().__setslice__
>>> ds_setslice(13, 42, 'foo')
Traceback (most recent call last):
...
NotImplementedError: 2-element slice assignment not supported by special_methods_T561_py2.DelSlice
>>> ds_delslice = DelSlice().__delslice__
>>> ds_delslice(13, 42)
DelSlice delslice 13 42
>>> sds_setslice = SetDelSlice().__setslice__
>>> sds_setslice(13, 42, 'foo')
SetDelSlice setslice 13 42 'foo'
>>> sds_delslice = SetDelSlice().__delslice__
>>> sds_delslice(13, 42)
SetDelSlice delslice 13 42
>>> # Python 3 does not use __long__.
>>> Ll = Long().__long__
>>> Ll()
Long __long__
"""
cdef class VerySpecial:
cdef readonly int value
def __init__(self, v):
self.value = v
print "VS __init__ %d" % self.value
def __getslice__(self, a, b):
print "VS __getslice__ %d %d %d" % (self.value, a, b)
def __next__(self):
print "VS next/__next__ %d" % self.value
def __nonzero__(self):
print "VS __nonzero__ %d" % self.value
def __oct__(self):
print "VS __oct__ %d" % self.value
def __hex__(self):
print "VS __hex__ %d" % self.value
def __cmp__(self, other):
print "VS __cmp__ %d %d" % (self.value, other.value)
def __div__(self, other):
print "VS __div__ %d %d" % (self.value, other.value)
def __idiv__(self, other):
print "VS __idiv__ %d /= %d" % (self.value, other.value)
cdef class SetSlice:
def __setslice__(self, a, b, value):
print "SetSlice setslice %d %d %r" % (a, b, value)
cdef class DelSlice:
def __delslice__(self, a, b):
print "DelSlice delslice %d %d" % (a, b)
cdef class SetDelSlice:
def __setslice__(self, a, b, value):
print "SetDelSlice setslice %d %d %r" % (a, b, value)
def __delslice__(self, a, b):
print "SetDelSlice delslice %d %d" % (a, b)
cdef class Long:
def __long__(self):
print "Long __long__"
# This file tests the behavior of special methods under Python 3
# after #561. (Only methods whose behavior differs between Python 2 and 3
# are tested here; see special_methods_T561.pyx for the rest of the tests.)
__doc__ = u"""
>>> vs0 = VerySpecial(0)
VS __init__ 0
>>> # Python 3 does not use __cmp__, so any provided __cmp__ method is
>>> # discarded under Python 3.
>>> vs0_cmp = vs0.__cmp__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__cmp__'
>>> # Python 3 does not use __div__ or __idiv__, so these methods are
>>> # discarded under Python 3.
>>> vs0_div = vs0.__div__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__div__'
>>> vs0_rdiv = vs0.__rdiv__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__rdiv__'
>>> vs0_idiv = vs0.__idiv__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__idiv__'
>>> # Python 3 does not use __oct__ or __hex__, so these methods are
>>> # discarded under Python 3.
>>> vs0_oct = vs0.__oct__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__oct__'
>>> vs0_hex = vs0.__hex__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.VerySpecial' object has no attribute '__hex__'
>>> # Python 3 does not use __long__; if you define __long__ but not
>>> # __int__, the __long__ definition will be used for __int__.
>>> Ll = Long().__long__
Traceback (most recent call last):
...
AttributeError: 'special_methods_T561_py3.Long' object has no attribute '__long__'
>>> Li = Long().__int__
>>> Li()
Long __long__
>>> # As of Python 3, defining __nonzero__ gives you a __bool__ method
>>> # instead.
>>> vs0_bool = vs0.__bool__
>>> vs0_bool()
VS __nonzero__ 0
False
"""
cdef class VerySpecial:
cdef readonly int value
def __init__(self, v):
self.value = v
print "VS __init__ %d" % self.value
def __nonzero__(self):
print "VS __nonzero__ %d" % self.value
def __oct__(self):
print "VS __oct__ %d" % self.value
def __hex__(self):
print "VS __hex__ %d" % self.value
def __cmp__(self, other):
print "VS __cmp__ %d %d" % (self.value, other.value)
def __div__(self, other):
print "VS __div__ %d %d" % (self.value, other.value)
def __idiv__(self, other):
print "VS __idiv__ %d /= %d" % (self.value, other.value)
cdef class Long:
def __long__(self):
print "Long __long__"
This diff is collapsed.
...@@ -7,8 +7,6 @@ __doc__ = u""" ...@@ -7,8 +7,6 @@ __doc__ = u"""
2 2
>>> print( "%d" % IntLongB() ) >>> print( "%d" % IntLongB() )
2 2
>>> print( "%d" % IntLongC() )
3
""" """
...@@ -23,8 +21,6 @@ def getint(int i): ...@@ -23,8 +21,6 @@ def getint(int i):
2 2
>>> getint( IntLongB() ) >>> getint( IntLongB() )
2 2
>>> getint( IntLongC() )
3
""" """
return i return i
...@@ -38,8 +34,6 @@ def getlong(long long i): ...@@ -38,8 +34,6 @@ def getlong(long long i):
2 2
>>> getlong( IntLongB() ) >>> getlong( IntLongB() )
2 2
>>> getlong( IntLongC() )
3
""" """
return <int>i return <int>i
...@@ -62,8 +56,3 @@ cdef class IntLongB: ...@@ -62,8 +56,3 @@ cdef class IntLongB:
def __int__(self): def __int__(self):
return 2 return 2
__long__ = __int__ __long__ = __int__
cdef class IntLongC:
def __long__(self):
return 3
__int__ = __long__
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment