diff Modules/itertoolsmodule.c @ 41782:bee8d01ef42c

Add a format specifier %R to PyUnicode_FromFormat(), which embeds the result of a call to PyObject_Repr() into the string. This makes it possible to simplify many repr implementations. PyUnicode_FromFormat() uses two steps to create the final string: A first pass through the format string determines the size of the final string and a second pass creates the string. To avoid calling PyObject_Repr() twice for each %R specifier, PyObject_Repr() is called during the size calculation step and the results are stored in an array (whose size is determined at the start by counting %R specifiers).
author Walter Dörwald <walter@livinglogic.de>
date Sat, 19 May 2007 21:49:49 +0000
parents b29d71d43c80
children e70cdce0e8b2
line wrap: on
line diff
--- a/Modules/itertoolsmodule.c	Fri May 18 22:12:08 2007 +0000
+++ b/Modules/itertoolsmodule.c	Sat May 19 21:49:49 2007 +0000
@@ -2389,20 +2389,10 @@
 static PyObject *
 repeat_repr(repeatobject *ro)
 {
-	PyObject *result, *objrepr;
-
-	objrepr = PyObject_Repr(ro->element);
-	if (objrepr == NULL)
-		return NULL;
-
 	if (ro->cnt == -1)
-		result = PyUnicode_FromFormat("repeat(%U)",
-			objrepr);
+		return PyUnicode_FromFormat("repeat(%R)", ro->element);
 	else
-		result = PyUnicode_FromFormat("repeat(%U, %zd)",
-			objrepr, ro->cnt);
-	Py_DECREF(objrepr);
-	return result;
+		return PyUnicode_FromFormat("repeat(%R, %zd)", ro->element, ro->cnt);
 }	
 
 static PyObject *