From: Georg Brandl <georg@python.org>
Date: Tue, 8 Aug 2006 11:56:21 +0000 (+0000)
Subject: Remove "non-mapping" and "non-sequence" from TypeErrors raised by
X-Git-Tag: v2.5c1~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0061c8e93aadc0d7e0c07734e04f056a8bcb8bb;p=thirdparty%2FPython%2Fcpython.git

Remove "non-mapping" and "non-sequence" from TypeErrors raised by
PyMapping_Size and PySequence_Size.

Because len() tries first sequence, then mapping size, it will always
raise a "non-mapping object has no len" error which is confusing.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 638e41787d07..bad9f965415e 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1114,7 +1114,7 @@ PySequence_Size(PyObject *s)
 	if (m && m->sq_length)
 		return m->sq_length(s);
 
-	type_error("non-sequence object of type '%.200s' has no len()", s);
+	type_error("object of type '%.200s' has no len()", s);
 	return -1;
 }
 
@@ -1705,7 +1705,7 @@ PyMapping_Size(PyObject *o)
 	if (m && m->mp_length)
 		return m->mp_length(o);
 
-	type_error("non-mapping object of type '%.200s' has no len()", o);
+	type_error("object of type '%.200s' has no len()", o);
 	return -1;
 }