mirror of
https://github.com/python/cpython
synced 2024-09-23 07:15:28 +00:00
SF bug 544647.
PyNumber_InPlaceMultiply insisted on calling sq_inplace_repeat if it existed, even if nb_inplace_multiply also existed and the arguments weren't right for sq_inplace_repeat. Change this to only use sq_inplace_repeat if nb_inplace_multiply isn't defined. Bugfix candidate.
This commit is contained in:
parent
7766091e04
commit
e8fc640349
|
@ -2929,6 +2929,32 @@ def __init__(self, arg):
|
|||
vereq(isinstance(d, D), True)
|
||||
vereq(d.foo, 1)
|
||||
|
||||
def imulbug():
|
||||
# SF bug 544647
|
||||
if verbose: print "Testing for __imul__ problems..."
|
||||
class C(object):
|
||||
def __imul__(self, other):
|
||||
return (self, other)
|
||||
x = C()
|
||||
y = x
|
||||
y *= 1.0
|
||||
vereq(y, (x, 1.0))
|
||||
y = x
|
||||
y *= 2
|
||||
vereq(y, (x, 2))
|
||||
y = x
|
||||
y *= 3L
|
||||
vereq(y, (x, 3L))
|
||||
y = x
|
||||
y *= 1L<<100
|
||||
vereq(y, (x, 1L<<100))
|
||||
y = x
|
||||
y *= None
|
||||
vereq(y, (x, None))
|
||||
y = x
|
||||
y *= "foo"
|
||||
vereq(y, (x, "foo"))
|
||||
|
||||
def test_main():
|
||||
class_docstrings()
|
||||
lists()
|
||||
|
@ -2992,6 +3018,7 @@ def test_main():
|
|||
dictproxyiteritems()
|
||||
pickleslots()
|
||||
funnynew()
|
||||
imulbug()
|
||||
if verbose: print "All OK"
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
@ -742,8 +742,12 @@ PyObject *
|
|||
PyNumber_InPlaceMultiply(PyObject *v, PyObject *w)
|
||||
{
|
||||
PyObject * (*g)(PyObject *, int) = NULL;
|
||||
if (HASINPLACE(v) && v->ob_type->tp_as_sequence &&
|
||||
(g = v->ob_type->tp_as_sequence->sq_inplace_repeat)) {
|
||||
if (HASINPLACE(v) &&
|
||||
v->ob_type->tp_as_sequence &&
|
||||
(g = v->ob_type->tp_as_sequence->sq_inplace_repeat) &&
|
||||
!(v->ob_type->tp_as_number &&
|
||||
v->ob_type->tp_as_number->nb_inplace_multiply))
|
||||
{
|
||||
long n;
|
||||
if (PyInt_Check(w)) {
|
||||
n = PyInt_AsLong(w);
|
||||
|
|
Loading…
Reference in a new issue