From: Mark Dickinson <dickinsm@gmail.com>
Date: Fri, 4 Dec 2009 10:07:01 +0000 (+0000)
Subject: Merged revisions 76663 via svnmerge from
X-Git-Tag: v3.1.2rc1~286
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=adef1ba5345dc6cd48ddf9cfa35ac273c5939fb4;p=python

Merged revisions 76663 via svnmerge from
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
index b2c7c140ae..3a6db18b2d 100644
--- 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();