languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-23 09:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

SF bug 544647.

Browse source 
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:
Guido van Rossum 2002-04-16 16:44:51 +00:00
parent 7766091e04
commit e8fc640349
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Lib/test/test_descr.py
View file

@ -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__":

8
Objects/abstract.c
View file

@ -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);