[Python-checkins] r82818 - in python/branches/py3k: Doc/library/cmath.rst Doc/library/math.rst Lib/test/test_cmath.py Lib/test/test_math.py Misc/NEWS Modules/cmathmodule.c Modules/mathmodule.c
mark.dickinson
python-checkins at python.org
Sun Jul 11 19:38:24 CEST 2010
Author: mark.dickinson
Date: Sun Jul 11 19:38:24 2010
New Revision: 82818
Log:
Issue #9165: Add math.isfinite and cmath.isfinite.
Modified:
python/branches/py3k/Doc/library/cmath.rst
python/branches/py3k/Doc/library/math.rst
python/branches/py3k/Lib/test/test_cmath.py
python/branches/py3k/Lib/test/test_math.py
python/branches/py3k/Misc/NEWS
python/branches/py3k/Modules/cmathmodule.c
python/branches/py3k/Modules/mathmodule.c
Modified: python/branches/py3k/Doc/library/cmath.rst
==============================================================================
--- python/branches/py3k/Doc/library/cmath.rst (original)
+++ python/branches/py3k/Doc/library/cmath.rst Sun Jul 11 19:38:24 2010
@@ -187,6 +187,12 @@
Classification functions
------------------------
+.. function:: isfinite(x)
+
+ Return ``True`` if both the real and imaginary parts of *x* are finite,
+ and ``False`` otherwise.
+
+
.. function:: isinf(x)
Return *True* if the real or the imaginary part of x is positive
Modified: python/branches/py3k/Doc/library/math.rst
==============================================================================
--- python/branches/py3k/Doc/library/math.rst (original)
+++ python/branches/py3k/Doc/library/math.rst Sun Jul 11 19:38:24 2010
@@ -97,6 +97,12 @@
<http://code.activestate.com/recipes/393090/>`_\.
+.. function:: isfinite(x)
+
+ Return ``True`` if *x* is neither an infinity nor a NaN, and
+ ``False`` otherwise. (Note that ``0.0`` *is* considered finite.)
+
+
.. function:: isinf(x)
Check if the float *x* is positive or negative infinity.
Modified: python/branches/py3k/Lib/test/test_cmath.py
==============================================================================
--- python/branches/py3k/Lib/test/test_cmath.py (original)
+++ python/branches/py3k/Lib/test/test_cmath.py Sun Jul 11 19:38:24 2010
@@ -442,6 +442,15 @@
self.assertCEqual(rect(1, pi/2), (0, 1.))
self.assertCEqual(rect(1, -pi/2), (0, -1.))
+ def test_isfinite(self):
+ real_vals = [float('-inf'), -2.3, -0.0,
+ 0.0, 2.3, float('inf'), float('nan')]
+ for x in real_vals:
+ for y in real_vals:
+ z = complex(x, y)
+ self.assertEquals(cmath.isfinite(z),
+ math.isfinite(x) and math.isfinite(y))
+
def test_isnan(self):
self.assertFalse(cmath.isnan(1))
self.assertFalse(cmath.isnan(1j))
Modified: python/branches/py3k/Lib/test/test_math.py
==============================================================================
--- python/branches/py3k/Lib/test/test_math.py (original)
+++ python/branches/py3k/Lib/test/test_math.py Sun Jul 11 19:38:24 2010
@@ -915,6 +915,15 @@
self.assertRaises(TypeError, math.trunc, 1, 2)
self.assertRaises(TypeError, math.trunc, TestNoTrunc())
+ def testIsfinite(self):
+ self.assertTrue(math.isfinite(0.0))
+ self.assertTrue(math.isfinite(-0.0))
+ self.assertTrue(math.isfinite(1.0))
+ self.assertTrue(math.isfinite(-1.0))
+ self.assertFalse(math.isfinite(float("nan")))
+ self.assertFalse(math.isfinite(float("inf")))
+ self.assertFalse(math.isfinite(float("-inf")))
+
def testIsnan(self):
self.assertTrue(math.isnan(float("nan")))
self.assertTrue(math.isnan(float("inf")* 0.))
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Sun Jul 11 19:38:24 2010
@@ -1415,6 +1415,9 @@
Extension Modules
-----------------
+- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to
+ accompany existing isinf and isnan functions.
+
- Issue #1578269: Implement os.symlink for Windows 6.0+. Patch by
Jason R. Coombs
Modified: python/branches/py3k/Modules/cmathmodule.c
==============================================================================
--- python/branches/py3k/Modules/cmathmodule.c (original)
+++ python/branches/py3k/Modules/cmathmodule.c Sun Jul 11 19:38:24 2010
@@ -1024,6 +1024,19 @@
Convert from polar coordinates to rectangular coordinates.");
static PyObject *
+cmath_isfinite(PyObject *self, PyObject *args)
+{
+ Py_complex z;
+ if (!PyArg_ParseTuple(args, "D:isfinite", &z))
+ return NULL;
+ return PyBool_FromLong(Py_IS_FINITE(z.real) && Py_IS_FINITE(z.imag));
+}
+
+PyDoc_STRVAR(cmath_isfinite_doc,
+"isfinite(z) -> bool\n\
+Return True if both the real and imaginary parts of z are finite, else False.");
+
+static PyObject *
cmath_isnan(PyObject *self, PyObject *args)
{
Py_complex z;
@@ -1065,6 +1078,7 @@
{"cos", cmath_cos, METH_VARARGS, c_cos_doc},
{"cosh", cmath_cosh, METH_VARARGS, c_cosh_doc},
{"exp", cmath_exp, METH_VARARGS, c_exp_doc},
+ {"isfinite", cmath_isfinite, METH_VARARGS, cmath_isfinite_doc},
{"isinf", cmath_isinf, METH_VARARGS, cmath_isinf_doc},
{"isnan", cmath_isnan, METH_VARARGS, cmath_isnan_doc},
{"log", cmath_log, METH_VARARGS, cmath_log_doc},
Modified: python/branches/py3k/Modules/mathmodule.c
==============================================================================
--- python/branches/py3k/Modules/mathmodule.c (original)
+++ python/branches/py3k/Modules/mathmodule.c Sun Jul 11 19:38:24 2010
@@ -1818,6 +1818,19 @@
Convert angle x from degrees to radians.");
static PyObject *
+math_isfinite(PyObject *self, PyObject *arg)
+{
+ double x = PyFloat_AsDouble(arg);
+ if (x == -1.0 && PyErr_Occurred())
+ return NULL;
+ return PyBool_FromLong((long)Py_IS_FINITE(x));
+}
+
+PyDoc_STRVAR(math_isfinite_doc,
+"isfinite(x) -> bool\n\n\
+Check if float x is finite (not an infinity or NaN).");
+
+static PyObject *
math_isnan(PyObject *self, PyObject *arg)
{
double x = PyFloat_AsDouble(arg);
@@ -1868,6 +1881,7 @@
{"fsum", math_fsum, METH_O, math_fsum_doc},
{"gamma", math_gamma, METH_O, math_gamma_doc},
{"hypot", math_hypot, METH_VARARGS, math_hypot_doc},
+ {"isfinite", math_isfinite, METH_O, math_isfinite_doc},
{"isinf", math_isinf, METH_O, math_isinf_doc},
{"isnan", math_isnan, METH_O, math_isnan_doc},
{"ldexp", math_ldexp, METH_VARARGS, math_ldexp_doc},
More information about the Python-checkins
mailing list