summaryrefslogtreecommitdiffstats
path: root/Objects/intobject.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1993-03-16 12:15:04 (GMT)
committerGuido van Rossum <guido@python.org>1993-03-16 12:15:04 (GMT)
commite537240c252ff678d49451ee6f80fa934653a724 (patch)
treeb3dcbdb870e90f5843ac66f26a102ea4da444ff5 /Objects/intobject.c
parentf48b419a075dc237eb145e1b71cec12afdb7aff4 (diff)
downloadcpython-e537240c252ff678d49451ee6f80fa934653a724.zip
cpython-e537240c252ff678d49451ee6f80fa934653a724.tar.gz
cpython-e537240c252ff678d49451ee6f80fa934653a724.tar.bz2
* Changed many files to use mkvalue() instead of newtupleobject().
* Fixcprt.py: added [-y file] option, do only files younger than file. * modsupport.[ch]: added vmkvalue(). * intobject.c: use mkvalue(). * stringobject.c: added "formatstring"; renamed string* to string_*; ceval.c: call formatstring for string % value. * longobject.c: close memory leak in divmod. * parsetok.c: set result node to NULL when returning an error.
Diffstat (limited to 'Objects/intobject.c')
-rw-r--r--Objects/intobject.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c
index e10dab2..858458c 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -1,6 +1,6 @@
/***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
All Rights Reserved
@@ -25,6 +25,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/* Integer object implementation */
#include "allobjects.h"
+#include "modsupport.h"
/* Standard Booleans */
@@ -252,18 +253,7 @@ int_divmod(x, y)
long d, m;
if (i_divmod(x, y, &d, &m) < 0)
return NULL;
- v = newtupleobject(2);
- v0 = newintobject(d);
- v1 = newintobject(m);
- if (v == NULL || v0 == NULL || v1 == NULL ||
- settupleitem(v, 0, v0) != 0 ||
- settupleitem(v, 1, v1) != 0) {
- XDECREF(v);
- XDECREF(v0);
- XDECREF(v1);
- v = NULL;
- }
- return v;
+ return mkvalue("(ll)", d, m);
}
static object *