mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-05 00:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added 1995 to copyright message.

Browse source 
bltinmodule.c: fixed coerce() nightmare in ternary pow().
modsupport.c (initmodule2): pass METH_FREENAME flag to newmethodobject().
pythonrun.c: move flushline() into and around print_error().
This commit is contained in:
Guido van Rossum 1995-01-04 19:12:13 +00:00
parent 524b588553
commit 6d023c98b0
32 changed files with 93 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Python/bltinmodule.c
View file

@ -1,6 +1,6 @@
/***********************************************************
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
Amsterdam, The Netherlands.
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
The Netherlands.
All Rights Reserved
@ -922,16 +922,31 @@ builtin_pow(self, args)
}
if (coerce(&v, &w) != 0)
return NULL;
if (z!=None) {
if (coerce(&w, &z) != 0)
return NULL;
if (coerce(&v, &z) != 0)
return NULL;
if (z == None) {
x = (*v->ob_type->tp_as_number->nb_power)(v, w, z);
}
else {
object *v1, *z1, *w2, *z2;
x = NULL;
v1 = v;
z1 = z;
if (coerce(&v1, &z1) != 0)
goto error2;
w2 = w;
z2 = z1;
if (coerce(&w2, &z2) != 0)
goto error1;
x = (*v1->ob_type->tp_as_number->nb_power)(v1, w2, z2);
DECREF(w2);
DECREF(z2);
error1:
DECREF(v1);
DECREF(z1);
error2:
;
}
x = (*v->ob_type->tp_as_number->nb_power)(v, w, z);
DECREF(v);
DECREF(w);
if (z!=None) {DECREF(w); DECREF(v); DECREF(z); DECREF(z);}
return x;
}