[Python-checkins] r76664 - in python/branches/release31-maint: Objects/object.c

[mark.dickinson]

Author: mark.dickinson
Date: Fri Dec  4 11:07:01 2009
New Revision: 76664

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Objects/object.c

Modified: python/branches/release31-maint/Objects/object.c
==============================================================================
--- python/branches/release31-maint/Objects/object.c	(original)
+++ python/branches/release31-maint/Objects/object.c	Fri Dec  4 11:07:01 2009
@@ -601,7 +601,7 @@
 			PyErr_BadInternalCall();
 		return NULL;
 	}
-	if (Py_EnterRecursiveCall(" in cmp"))
+	if (Py_EnterRecursiveCall(" in comparison"))
 		return NULL;
 	res = do_richcompare(v, w, op);
 	Py_LeaveRecursiveCall();