diff options
author | Georg Brandl <georg@python.org> | 2009-04-27 16:49:41 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-04-27 16:49:41 (GMT) |
commit | 0192bffe9002e5878fcbeb1604739286ee0d138f (patch) | |
tree | 9386c2632af9f7249269edfefe8854aff42c8d20 /Objects/abstract.c | |
parent | 505a0798e654ad1933668fb4f15e076bf6753c7a (diff) | |
download | cpython-0192bffe9002e5878fcbeb1604739286ee0d138f.zip cpython-0192bffe9002e5878fcbeb1604739286ee0d138f.tar.gz cpython-0192bffe9002e5878fcbeb1604739286ee0d138f.tar.bz2 |
Merged revisions 71607,71653,71696,71771,71786 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71607 | benjamin.peterson | 2009-04-14 23:23:09 +0200 (Di, 14 Apr 2009) | 1 line
tupel -> tuple
........
r71653 | raymond.hettinger | 2009-04-16 20:16:10 +0200 (Do, 16 Apr 2009) | 1 line
Clarify the behavior of any() and all() with an empty iterable.
........
r71696 | georg.brandl | 2009-04-18 10:26:21 +0200 (Sa, 18 Apr 2009) | 1 line
"not subscriptable" should be a bit more understandable than "unsubscriptable".
........
r71771 | raymond.hettinger | 2009-04-20 20:23:57 +0200 (Mo, 20 Apr 2009) | 1 line
Fix typo
........
r71786 | georg.brandl | 2009-04-21 20:23:08 +0200 (Di, 21 Apr 2009) | 1 line
#5757: fix copy-paste error in notify().
........
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r-- | Objects/abstract.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index a4d3964..7679d5b 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -135,7 +135,7 @@ PyObject_GetItem(PyObject *o, PyObject *key) "be integer, not '%.200s'", key); } - return type_error("'%.200s' object is unsubscriptable", o); + return type_error("'%.200s' object is not subscriptable", o); } int |