From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 12 Aug 2004 14:42:37 +0000 (+0000)
Subject: Patch #1005468: Disambiguate "min() or max()" exception string.
X-Git-Tag: v2.4a3~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd39ad4937f5f48142c7dafdac9d727931137c96;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 04fcf597b1ae..f7715b6de7ed 100644
--- 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;
 }