mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Merged revisions 78319 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78319 | ezio.melotti | 2010-02-22 18:30:58 +0200 (Mon, 22 Feb 2010) | 1 line #7482: clarify error message in case of division by zero of float and complex numbers. ........
This commit is contained in:
parent
19e4acfa15
commit
50363262b2
2 changed files with 2 additions and 2 deletions
|
@ -504,7 +504,7 @@ complex_div(PyObject *v, PyObject *w)
|
||||||
quot = c_quot(a, b);
|
quot = c_quot(a, b);
|
||||||
PyFPE_END_PROTECT(quot)
|
PyFPE_END_PROTECT(quot)
|
||||||
if (errno == EDOM) {
|
if (errno == EDOM) {
|
||||||
PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
|
PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return PyComplex_FromCComplex(quot);
|
return PyComplex_FromCComplex(quot);
|
||||||
|
|
|
@ -570,7 +570,7 @@ float_div(PyObject *v, PyObject *w)
|
||||||
#ifdef Py_NAN
|
#ifdef Py_NAN
|
||||||
if (b == 0.0) {
|
if (b == 0.0) {
|
||||||
PyErr_SetString(PyExc_ZeroDivisionError,
|
PyErr_SetString(PyExc_ZeroDivisionError,
|
||||||
"float division");
|
"float division by zero");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue