Index: Objects/complexobject.c
===================================================================
--- Objects/complexobject.c	(revision 76697)
+++ Objects/complexobject.c	(working copy)
@@ -540,7 +540,7 @@
 	quot = c_quot(v->cval,w->cval);
 	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);
@@ -561,7 +561,7 @@
 	quot = c_quot(v->cval,w->cval);
 	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);
@@ -579,7 +579,7 @@
 	errno = 0;
 	div = c_quot(v->cval,w->cval); /* The raw divisor value. */
 	if (errno == EDOM) {
-		PyErr_SetString(PyExc_ZeroDivisionError, "complex remainder");
+		PyErr_SetString(PyExc_ZeroDivisionError, "complex remainder by zero");
 		return NULL;
 	}
 	div.real = floor(div.real); /* Use the floor of the real part. */
@@ -603,7 +603,7 @@
 	errno = 0;
 	div = c_quot(v->cval,w->cval); /* The raw divisor value. */
 	if (errno == EDOM) {
-		PyErr_SetString(PyExc_ZeroDivisionError, "complex divmod()");
+		PyErr_SetString(PyExc_ZeroDivisionError, "complex divmod() by zero");
 		return NULL;
 	}
 	div.real = floor(div.real); /* Use the floor of the real part. */
Index: Objects/floatobject.c
===================================================================
--- Objects/floatobject.c	(revision 76697)
+++ Objects/floatobject.c	(working copy)
@@ -668,7 +668,7 @@
 #ifdef Py_NAN
 	if (b == 0.0) {
 		PyErr_SetString(PyExc_ZeroDivisionError,
-				"float division");
+				"float division by zero");
 		return NULL;
 	}
 #endif
@@ -690,7 +690,7 @@
 #ifdef Py_NAN
 	if (b == 0.0) {
 		PyErr_SetString(PyExc_ZeroDivisionError,
-				"float division");
+				"float division by zero");
 		return NULL;
 	}
 #endif
@@ -710,7 +710,7 @@
 #ifdef Py_NAN
 	if (wx == 0.0) {
 		PyErr_SetString(PyExc_ZeroDivisionError,
-				"float modulo");
+				"float modulo by zero");
 		return NULL;
 	}
 #endif
@@ -733,7 +733,7 @@
  	CONVERT_TO_DOUBLE(v, vx);
  	CONVERT_TO_DOUBLE(w, wx);
 	if (wx == 0.0) {
-		PyErr_SetString(PyExc_ZeroDivisionError, "float divmod()");
+		PyErr_SetString(PyExc_ZeroDivisionError, "float divmod() by zero");
 		return NULL;
 	}
 	PyFPE_START_PROTECT("divmod", return 0)