Skip to content

Commit d21a324

Browse files
author
guido
committed
Added 1995 to copyright message.
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(). git-svn-id: http://svn.python.org/projects/python/trunk@4516 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 9079961 commit d21a324

32 files changed

Lines changed: 93 additions & 76 deletions

‎Modules/cgensupport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/bltinmodule.c‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66
@@ -922,16 +922,31 @@ builtin_pow(self, args)
922922
}
923923
if (coerce(&v, &w) != 0)
924924
return NULL;
925-
if (z!=None) {
926-
if (coerce(&w, &z) != 0)
927-
return NULL;
928-
if (coerce(&v, &z) != 0)
929-
return NULL;
925+
if (z == None) {
926+
x = (*v->ob_type->tp_as_number->nb_power)(v, w, z);
927+
}
928+
else {
929+
object *v1, *z1, *w2, *z2;
930+
x = NULL;
931+
v1 = v;
932+
z1 = z;
933+
if (coerce(&v1, &z1) != 0)
934+
goto error2;
935+
w2 = w;
936+
z2 = z1;
937+
if (coerce(&w2, &z2) != 0)
938+
goto error1;
939+
x = (*v1->ob_type->tp_as_number->nb_power)(v1, w2, z2);
940+
DECREF(w2);
941+
DECREF(z2);
942+
error1:
943+
DECREF(v1);
944+
DECREF(z1);
945+
error2:
946+
;
930947
}
931-
x = (*v->ob_type->tp_as_number->nb_power)(v, w, z);
932948
DECREF(v);
933949
DECREF(w);
934-
if (z!=None) {DECREF(w); DECREF(v); DECREF(z); DECREF(z);}
935950
return x;
936951
}
937952

‎Python/ceval.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/cgensupport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/compile.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/errors.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/fmod.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/frozenmain.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/getargs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

‎Python/getcwd.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/***********************************************************
2-
Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum,
3-
Amsterdam, The Netherlands.
2+
Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
3+
The Netherlands.
44
55
All Rights Reserved
66

0 commit comments

Comments
 (0)