diff options
| author | Tim Peters <tim.peters@gmail.com> | 2000-10-06 00:36:09 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2000-10-06 00:36:09 (GMT) |
| commit | c54d19043a595679f253a55e46fda2910f513c52 (patch) | |
| tree | a737fd6e07e1224f22837ac9822f36b5cdb1524d /Objects/intobject.c | |
| parent | 4779a0a6fd444d594f1cbb992c636d66f59a5d1d (diff) | |
| download | cpython-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/intobject.c')
| -rw-r--r-- | Objects/intobject.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Objects/intobject.c b/Objects/intobject.c index b88a05d..c9d1f6a 100644 --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -483,8 +483,12 @@ int_pow(PyIntObject *v, PyIntObject *w, PyIntObject *z) iv = v->ob_ival; iw = w->ob_ival; if (iw < 0) { - PyErr_SetString(PyExc_ValueError, - "integer to the negative power"); + if (iv) + PyErr_SetString(PyExc_ValueError, + "integer to a negative power"); + else + PyErr_SetString(PyExc_ZeroDivisionError, + "0 to a negative power"); return NULL; } if ((PyObject *)z != Py_None) { |