Merged revisions 78319 via svnmerge from

ezio-melotti · ezio-melotti · commit 50363262b286 · 2010-02-22T16:34:50.000Z
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. ........
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -504,7 +504,7 @@ complex_div(PyObject *v, PyObject *w)
 	quot = c_quot(a, b);
 	PyFPE_END_PROTECT(quot)
 	if (errno == EDOM) {
-		PyErr_SetString(PyExc_ZeroDivisionError, "complex division");
+		PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");
 		return NULL;
 	}
 	return PyComplex_FromCComplex(quot);
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
@@ -570,7 +570,7 @@ float_div(PyObject *v, PyObject *w)
 #ifdef Py_NAN
 	if (b == 0.0) {
 		PyErr_SetString(PyExc_ZeroDivisionError,
-				"float division");
+				"float division by zero");
 		return NULL;
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -504,7 +504,7 @@ complex_div(PyObject v, PyObject w)`
`504`	`504`	`quot = c_quot(a, b);`
`505`	`505`	`PyFPE_END_PROTECT(quot)`
`506`	`506`	`if (errno == EDOM) {`
`507`		`- PyErr_SetString(PyExc_ZeroDivisionError, "complex division");`
	`507`	`+ PyErr_SetString(PyExc_ZeroDivisionError, "complex division by zero");`
`508`	`508`	`return NULL;`
`509`	`509`	`}`
`510`	`510`	`return PyComplex_FromCComplex(quot);`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ float_div(PyObject v, PyObject w)`
`570`	`570`	`#ifdef Py_NAN`
`571`	`571`	`if (b == 0.0) {`
`572`	`572`	`PyErr_SetString(PyExc_ZeroDivisionError,`
`573`		`- "float division");`
	`573`	`+ "float division by zero");`
`574`	`574`	`return NULL;`
`575`	`575`	`}`
`576`	`576`	`#endif`