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 b2c7c140ae094ee5dd8fd26fc999cefc1bed593e..3a6db18b2de00ca26d6ed914c1edb25855275882 100644 (file)
--- 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();