traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-33083 - Make math.factorial reject arguments that are not int-like (GH-6149) 

math.factorial() was accepting non-integral Decimal instances. This is inconsistent with the actual behaviour for floats, which are not accepted.
This commit is contained in:
Pablo Galindo 2018-09-03 22:20:06 +01:00 committed by GitHub
parent 65fc98e7b1
commit e9ba3705de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_math.py
View File

@ -5,6 +5,7 @@ from test.support import run_unittest, verbose, requires_IEEE_754
from test import support
import unittest
import itertools
import decimal
import math
import os
import platform
@ -510,6 +511,10 @@ class MathTests(unittest.TestCase):
self.assertRaises(ValueError, math.factorial, -1e100)
self.assertRaises(ValueError, math.factorial, math.pi)
def testFactorialNonIntegers(self):
self.assertRaises(TypeError, math.factorial, decimal.Decimal(5.2))
self.assertRaises(TypeError, math.factorial, "5")
# Other implementations may place different upper bounds.
@support.cpython_only
def testFactorialHugeInputs(self):

2
Misc/NEWS.d/next/Core and Builtins/2018-03-19-00-59-20.bpo-33083.Htztjl.rst Normal file
View File

@ -0,0 +1,2 @@
``math.factorial`` no longer accepts arguments that are not int-like.
Patch by Pablo Galindo.

12
Modules/mathmodule.c
View File

@ -1656,7 +1656,7 @@ math_factorial(PyObject *module, PyObject *arg)
{
long x;
int overflow;
PyObject *result, *odd_part, *two_valuation;
PyObject *result, *odd_part, *two_valuation, *pyint_form;
if (PyFloat_Check(arg)) {
PyObject *lx;
@ -1672,8 +1672,14 @@ math_factorial(PyObject *module, PyObject *arg)
x = PyLong_AsLongAndOverflow(lx, &overflow);
Py_DECREF(lx);
}
else
x = PyLong_AsLongAndOverflow(arg, &overflow);
else {
pyint_form = PyNumber_Index(arg);
if (pyint_form == NULL) {
return NULL;
}
x = PyLong_AsLongAndOverflow(pyint_form, &overflow);
Py_DECREF(pyint_form);
}
if (x == -1 && PyErr_Occurred()) {
return NULL;