mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Martin v. Löwis 2004-08-12 14:42:37 +00:00
parent 9ecf326714
commit fd39ad4937
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/bltinmodule.c
View file

@ -1116,11 +1116,12 @@ Update and return a dictionary containing the current scope's local variables.")
static PyObject * static PyObject *
min_max(PyObject *args, int op) min_max(PyObject *args, int op)
{ {
const char *name = op == Py_LT ? "min" : "max";
PyObject *v, *w, *x, *it; PyObject *v, *w, *x, *it;
if (PyTuple_Size(args) > 1) if (PyTuple_Size(args) > 1)
v = args; 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; return NULL;
it = PyObject_GetIter(v); it = PyObject_GetIter(v);
@ -1158,8 +1159,8 @@ min_max(PyObject *args, int op)
} }
} }
if (w == NULL) if (w == NULL)
PyErr_SetString(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"min() or max() arg is an empty sequence"); "%s() arg is an empty sequence", name);
Py_DECREF(it); Py_DECREF(it);
return w; return w;
} }