Issue #20539: Improve math.factorial error messages and types for large inputs.

- Better message for the OverflowError in large positive inputs.
- Changed exception type from OverflowError to ValueError for large negative inputs.
This commit is contained in:
Mark Dickinson 2014-04-10 09:29:39 -04:00
parent 6ed7c20ce5
commit 5990d2864c
3 changed files with 26 additions and 6 deletions

View file

@ -1408,6 +1408,7 @@ static PyObject *
math_factorial(PyObject *self, PyObject *arg)
{
long x;
int overflow;
PyObject *result, *odd_part, *two_valuation;
if (PyFloat_Check(arg)) {
@ -1421,15 +1422,22 @@ math_factorial(PyObject *self, PyObject *arg)
lx = PyLong_FromDouble(dx);
if (lx == NULL)
return NULL;
x = PyLong_AsLong(lx);
x = PyLong_AsLongAndOverflow(lx, &overflow);
Py_DECREF(lx);
}
else
x = PyLong_AsLong(arg);
x = PyLong_AsLongAndOverflow(arg, &overflow);
if (x == -1 && PyErr_Occurred())
if (x == -1 && PyErr_Occurred()) {
return NULL;
if (x < 0) {
}
else if (overflow == 1) {
PyErr_Format(PyExc_OverflowError,
"factorial() argument should not exceed %ld",
LONG_MAX);
return NULL;
}
else if (overflow == -1 || x < 0) {
PyErr_SetString(PyExc_ValueError,
"factorial() not defined for negative values");
return NULL;