diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-03-13 21:13:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-03-13 21:13:35 (GMT) |
| commit | 7d74b70e51436a3fab3c3eb35bab6566b60b65eb (patch) | |
| tree | ca2408041d51aeedabf068347fa4ca5387e4f342 /Modules | |
| parent | df50cebbed06731512543de7fb96137ecb453ab2 (diff) | |
| parent | 47930016ff2bf57134d4976ae75b00b8e2dad01d (diff) | |
| download | cpython-7d74b70e51436a3fab3c3eb35bab6566b60b65eb.zip cpython-7d74b70e51436a3fab3c3eb35bab6566b60b65eb.tar.gz cpython-7d74b70e51436a3fab3c3eb35bab6566b60b65eb.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mathmodule.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c index 04f8f66..d693da1 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -745,13 +745,13 @@ math_1_to_whatever(PyObject *arg, double (*func) (double), return NULL; } if (Py_IS_INFINITY(r) && Py_IS_FINITE(x)) { - if (can_overflow) - PyErr_SetString(PyExc_OverflowError, - "math range error"); /* overflow */ - else - PyErr_SetString(PyExc_ValueError, - "math domain error"); /* singularity */ - return NULL; + if (can_overflow) + PyErr_SetString(PyExc_OverflowError, + "math range error"); /* overflow */ + else + PyErr_SetString(PyExc_ValueError, + "math domain error"); /* singularity */ + return NULL; } if (Py_IS_FINITE(r) && errno && is_error(r)) /* this branch unnecessary on most platforms */ |