summaryrefslogtreecommitdiffstats
path: root/Objects/longobject.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2000-10-06 00:36:09 (GMT)
committerTim Peters <tim.peters@gmail.com>2000-10-06 00:36:09 (GMT)
commitc54d19043a595679f253a55e46fda2910f513c52 (patch)
treea737fd6e07e1224f22837ac9822f36b5cdb1524d /Objects/longobject.c
parent4779a0a6fd444d594f1cbb992c636d66f59a5d1d (diff)
downloadcpython-c54d19043a595679f253a55e46fda2910f513c52.zip
cpython-c54d19043a595679f253a55e46fda2910f513c52.tar.gz
cpython-c54d19043a595679f253a55e46fda2910f513c52.tar.bz2
SF bug 115831 and Ping's SF patch 101751, 0.0**-2.0 returns inf rather than
raise ValueError. Checked in the patch as far as it went, but also changed all of ints, longs and floats to raise ZeroDivisionError instead when raising 0 to a negative number. This is what 754-inspired stds require, as the "true result" is an infinity obtained from finite operands, i.e. it's a singularity. Also changed float pow to not be so timid about using its square-and-multiply algorithm. Note that what math.pow does is unrelated to what builtin pow does, and will still vary by platform.
Diffstat (limited to 'Objects/longobject.c')
-rw-r--r--Objects/longobject.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 65dcaa0..bfb431f 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -1244,8 +1244,12 @@ long_pow(PyLongObject *a, PyLongObject *b, PyLongObject *c)
size_b = b->ob_size;
if (size_b < 0) {
- PyErr_SetString(PyExc_ValueError,
- "long integer to the negative power");
+ if (a->ob_size)
+ PyErr_SetString(PyExc_ValueError,
+ "long integer to a negative power");
+ else
+ PyErr_SetString(PyExc_ZeroDivisionError,
+ "zero to a negative power");
return NULL;
}
z = (PyLongObject *)PyLong_FromLong(1L);