Merged revisions 76663 via svnmerge from

mdickinson · mdickinson · commit adef1ba5345d · 2009-12-04T10:07:01.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r76663 | mark.dickinson | 2009-12-04 10:06:06 +0000 (Fri, 04 Dec 2009) | 1 line Issue #7430: Remove lingering reference to cmp in recursion error message. ........
diff --git a/Objects/object.c b/Objects/object.c
@@ -601,7 +601,7 @@ PyObject_RichCompare(PyObject *v, PyObject *w, int op)
 			PyErr_BadInternalCall();
 		return NULL;
 	}
-	if (Py_EnterRecursiveCall(" in cmp"))
+	if (Py_EnterRecursiveCall(" in comparison"))
 		return NULL;
 	res = do_richcompare(v, w, op);
 	Py_LeaveRecursiveCall();

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ PyObject_RichCompare(PyObject v, PyObject w, int op)`
`601`	`601`	`PyErr_BadInternalCall();`
`602`	`602`	`return NULL;`
`603`	`603`	`}`
`604`		`- if (Py_EnterRecursiveCall(" in cmp"))`
	`604`	`+ if (Py_EnterRecursiveCall(" in comparison"))`
`605`	`605`	`return NULL;`
`606`	`606`	`res = do_richcompare(v, w, op);`
`607`	`607`	`Py_LeaveRecursiveCall();`