Skip to content

Commit 0494f10

Browse files
committed
Remove deprecation warning for floats
1 parent 5ebef8b commit 0494f10

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

Lib/test/test_math.py

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -498,20 +498,18 @@ def testFabs(self):
498498

499499
def testFactorial(self):
500500
self.assertEqual(math.factorial(0), 1)
501-
with self.assertWarns(DeprecationWarning):
502-
self.assertEqual(math.factorial(0.0), 1)
503-
total = 1
504-
for i in range(1, 1000):
505-
total *= i
506-
self.assertEqual(math.factorial(i), total)
507-
self.assertEqual(math.factorial(float(i)), total)
508-
self.assertEqual(math.factorial(i), py_factorial(i))
501+
self.assertEqual(math.factorial(0.0), 1)
502+
total = 1
503+
for i in range(1, 1000):
504+
total *= i
505+
self.assertEqual(math.factorial(i), total)
506+
self.assertEqual(math.factorial(float(i)), total)
507+
self.assertEqual(math.factorial(i), py_factorial(i))
509508
self.assertRaises(ValueError, math.factorial, -1)
510-
with self.assertWarns(DeprecationWarning):
511-
self.assertRaises(ValueError, math.factorial, -1.0)
512-
self.assertRaises(ValueError, math.factorial, -10**100)
513-
self.assertRaises(ValueError, math.factorial, -1e100)
514-
self.assertRaises(ValueError, math.factorial, math.pi)
509+
self.assertRaises(ValueError, math.factorial, -1.0)
510+
self.assertRaises(ValueError, math.factorial, -10**100)
511+
self.assertRaises(ValueError, math.factorial, -1e100)
512+
self.assertRaises(ValueError, math.factorial, math.pi)
515513

516514
def testFactorialNonIntegers(self):
517515
self.assertRaises(TypeError, math.factorial, decimal.Decimal(5.2))
@@ -523,8 +521,7 @@ def testFactorialHugeInputs(self):
523521
# Currently raises ValueError for inputs that are too large
524522
# to fit into a C long.
525523
self.assertRaises(OverflowError, math.factorial, 10**100)
526-
with self.assertWarns(DeprecationWarning):
527-
self.assertRaises(OverflowError, math.factorial, 1e100)
524+
self.assertRaises(OverflowError, math.factorial, 1e100)
528525

529526
def testFloor(self):
530527
self.assertRaises(TypeError, math.floor)

Modules/mathmodule.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,16 +1671,10 @@ math_factorial(PyObject *module, PyObject *arg)
16711671
return NULL;
16721672
x = PyLong_AsLongAndOverflow(lx, &overflow);
16731673
Py_DECREF(lx);
1674-
if (PyErr_WarnEx(PyExc_DeprecationWarning,
1675-
"Passing float instances to math.factorial will be "
1676-
"removed in future versions.", 1) < 0) {
1677-
return NULL;
1678-
}
1679-
16801674
}
16811675
else{
16821676
pyint_form = PyNumber_Index(arg);
1683-
if( pyint_form == NULL){
1677+
if(pyint_form == NULL){
16841678
return NULL;
16851679
}
16861680
x = PyLong_AsLongAndOverflow(pyint_form, &overflow);

0 commit comments

Comments
 (0)