Patch #1005468: Disambiguate "min() or max()" exception string.

loewis · loewis · commit fd39ad4937f5 · 2004-08-12T14:42:37.000Z
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -1116,11 +1116,12 @@ Update and return a dictionary containing the current scope's local variables.")
 static PyObject *
 min_max(PyObject *args, int op)
 {
+	const char *name = op == Py_LT ? "min" : "max";
 	PyObject *v, *w, *x, *it;
 
 	if (PyTuple_Size(args) > 1)
 		v = args;
-	else if (!PyArg_UnpackTuple(args, (op==Py_LT) ? "min" : "max", 1, 1, &v))
+	else if (!PyArg_UnpackTuple(args, (char *)name, 1, 1, &v))
 		return NULL;
 
 	it = PyObject_GetIter(v);
@@ -1158,8 +1159,8 @@ min_max(PyObject *args, int op)
 		}
 	}
 	if (w == NULL)
-		PyErr_SetString(PyExc_ValueError,
-				"min() or max() arg is an empty sequence");
+		PyErr_Format(PyExc_ValueError,
+			     "%s() arg is an empty sequence", name);
 	Py_DECREF(it);
 	return w;
 }

Original file line number	Diff line number	Diff line change
`@@ -1116,11 +1116,12 @@ Update and return a dictionary containing the current scope's local variables.")`
`1116`	`1116`	`static PyObject *`
`1117`	`1117`	`min_max(PyObject *args, int op)`
`1118`	`1118`	`{`
	`1119`	`+ const char *name = op == Py_LT ? "min" : "max";`
`1119`	`1120`	`PyObject v, w, x, it;`
`1120`	`1121`
`1121`	`1122`	`if (PyTuple_Size(args) > 1)`
`1122`	`1123`	`v = args;`
`1123`		`- else if (!PyArg_UnpackTuple(args, (op==Py_LT) ? "min" : "max", 1, 1, &v))`
	`1124`	`+ else if (!PyArg_UnpackTuple(args, (char *)name, 1, 1, &v))`
`1124`	`1125`	`return NULL;`
`1125`	`1126`
`1126`	`1127`	`it = PyObject_GetIter(v);`
`@@ -1158,8 +1159,8 @@ min_max(PyObject *args, int op)`
`1158`	`1159`	`}`
`1159`	`1160`	`}`
`1160`	`1161`	`if (w == NULL)`
`1161`		`- PyErr_SetString(PyExc_ValueError,`
`1162`		`- "min() or max() arg is an empty sequence");`
	`1162`	`+ PyErr_Format(PyExc_ValueError,`
	`1163`	`+ "%s() arg is an empty sequence", name);`
`1163`	`1164`	`Py_DECREF(it);`
`1164`	`1165`	`return w;`
`1165`	`1166`	`}`