summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-06-28 19:46:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-06-28 19:46:35 (GMT)
commit26eb9d0b47e1bf4645119f2394f3c467b8fa5fb4 (patch)
tree4439b732156c20e85b1e93485f92d6c584c93a48 /Objects
parent783df8d49192846c6ac2cc646b210916d5daf9eb (diff)
downloadcpython-26eb9d0b47e1bf4645119f2394f3c467b8fa5fb4.zip
cpython-26eb9d0b47e1bf4645119f2394f3c467b8fa5fb4.tar.gz
cpython-26eb9d0b47e1bf4645119f2394f3c467b8fa5fb4.tar.bz2
Merged revisions 82342 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82342 | benjamin.peterson | 2010-06-28 14:43:42 -0500 (Mon, 28 Jun 2010) | 1 line update error message ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/abstract.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 2d85104..75eb154 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2533,8 +2533,7 @@ recursive_isinstance(PyObject *inst, PyObject *cls)
}
else {
if (!check_class(cls,
- "isinstance() arg 2 must be a class, type,"
- " or tuple of classes and types"))
+ "isinstance() arg 2 must be a type or tuple of types"))
return -1;
icls = PyObject_GetAttr(inst, __class__);
if (icls == NULL) {