Use PyTuple_Pack() to simplify enumerate().

rhettinger · rhettinger · commit c92f3f29a663 · 2003-11-02T05:37:44.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@34552 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Objects/enumobject.c b/Objects/enumobject.c
@@ -31,16 +31,12 @@ enum_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 		Py_DECREF(en);
 		return NULL;
 	}
-	en->en_result = PyTuple_New(2);
+	en->en_result = PyTuple_Pack(2, Py_None, Py_None);
 	if (en->en_result == NULL) {
 		Py_DECREF(en->en_sit);
 		Py_DECREF(en);
 		return NULL;
 	}
-	Py_INCREF(Py_None);
-	PyTuple_SET_ITEM(en->en_result, 0, Py_None);
-	Py_INCREF(Py_None);
-	PyTuple_SET_ITEM(en->en_result, 1, Py_None);
 	return (PyObject *)en;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,16 +31,12 @@ enum_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`31`	`31`	`Py_DECREF(en);`
`32`	`32`	`return NULL;`
`33`	`33`	`}`
`34`		`- en->en_result = PyTuple_New(2);`
	`34`	`+ en->en_result = PyTuple_Pack(2, Py_None, Py_None);`
`35`	`35`	`if (en->en_result == NULL) {`
`36`	`36`	`Py_DECREF(en->en_sit);`
`37`	`37`	`Py_DECREF(en);`
`38`	`38`	`return NULL;`
`39`	`39`	`}`
`40`		`- Py_INCREF(Py_None);`
`41`		`- PyTuple_SET_ITEM(en->en_result, 0, Py_None);`
`42`		`- Py_INCREF(Py_None);`
`43`		`- PyTuple_SET_ITEM(en->en_result, 1, Py_None);`
`44`	`40`	`return (PyObject *)en;`
`45`	`41`	`}`
`46`	`42`