summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-12-04 10:07:01 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-12-04 10:07:01 (GMT)
commitadef1ba5345dc6cd48ddf9cfa35ac273c5939fb4 (patch)
tree19e388e023dc1882baef1787de4df3201f2dbbaf
parent8054a5d36e42690c95975a9065abbc9285add053 (diff)
downloadcpython-adef1ba5345dc6cd48ddf9cfa35ac273c5939fb4.zip
cpython-adef1ba5345dc6cd48ddf9cfa35ac273c5939fb4.tar.gz
cpython-adef1ba5345dc6cd48ddf9cfa35ac273c5939fb4.tar.bz2
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. ........
-rw-r--r--Objects/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/object.c b/Objects/object.c
index b2c7c14..3a6db18 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();